diff -Nru xbmc-11.0~git20120423.cd20772/aclocal.m4 xbmc-11.0~git20120510.82388d5/aclocal.m4
--- xbmc-11.0~git20120423.cd20772/aclocal.m4 2012-04-23 19:55:32.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/aclocal.m4 2012-05-10 21:32:22.000000000 +0000
@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff -Nru xbmc-11.0~git20120423.cd20772/addons/skin.confluence/language/French/strings.xml xbmc-11.0~git20120510.82388d5/addons/skin.confluence/language/French/strings.xml
--- xbmc-11.0~git20120423.cd20772/addons/skin.confluence/language/French/strings.xml 2012-04-23 19:34:31.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/addons/skin.confluence/language/French/strings.xml 2012-05-10 21:32:14.000000000 +0000
@@ -3,7 +3,7 @@
Changement des
J'aime
- Je deteste
+ Je déteste
Options d'alimentation
En cours...
Cacher INFO
@@ -88,9 +88,9 @@
Add-on Lyrics
Add-on Sous-titres
- Sous-menu Videos de la page d'acceuil
- Sous-menu Musique de la page d'acceuil
- Sous-menu Images de la page d'acceuil
+ Sous-menu Videos de la page d'accueil
+ Sous-menu Musique de la page d'accueil
+ Sous-menu Images de la page d'accueil
OSD Musique
OSD Vidéo
diff -Nru xbmc-11.0~git20120423.cd20772/configure xbmc-11.0~git20120510.82388d5/configure
--- xbmc-11.0~git20120423.cd20772/configure 2012-04-23 19:55:33.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/configure 2012-05-10 21:32:23.000000000 +0000
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for xbmc 11.0.
+# Generated by GNU Autoconf 2.69 for xbmc 11.0.
#
# Report bugs to .
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
# ... 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'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -724,8 +744,6 @@
BLURAY_SONAME
LIBBLURAY_LIBS
LIBBLURAY_CFLAGS
-TINYXML_LIBS
-TINYXML_CFLAGS
FREETYPE2_LIBS
FREETYPE2_CFLAGS
SAMPLERATE_LIBS
@@ -962,8 +980,6 @@
SAMPLERATE_LIBS
FREETYPE2_CFLAGS
FREETYPE2_LIBS
-TINYXML_CFLAGS
-TINYXML_LIBS
LIBBLURAY_CFLAGS
LIBBLURAY_LIBS
ALSA_CFLAGS
@@ -1450,8 +1466,6 @@
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.
- 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
fi
@@ -1739,10 +1753,6 @@
C compiler flags for FREETYPE2, overriding pkg-config
FREETYPE2_LIBS
linker flags for FREETYPE2, overriding pkg-config
- TINYXML_CFLAGS
- C compiler flags for TINYXML, overriding pkg-config
- TINYXML_LIBS
- linker flags for TINYXML, overriding pkg-config
LIBBLURAY_CFLAGS
C compiler flags for LIBBLURAY, overriding pkg-config
LIBBLURAY_LIBS
@@ -1852,9 +1862,9 @@
if $ac_init_version; then
cat <<\_ACEOF
xbmc configure 11.0
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1968,7 +1978,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2228,7 +2238,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2409,7 +2419,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2425,7 +2436,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2451,7 +2463,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2467,7 +2480,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2501,7 +2515,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2743,7 +2758,8 @@
main ()
{
static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2759,7 +2775,8 @@
{
static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2816,7 +2833,8 @@
main ()
{
static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2849,7 +2867,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by xbmc $as_me 11.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3365,7 +3383,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3534,7 +3552,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3574,7 +3592,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3625,7 +3643,7 @@
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -3678,7 +3696,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4379,7 +4397,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4423,7 +4441,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5073,7 +5091,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5113,7 +5131,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5166,7 +5184,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5207,7 +5225,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -5265,7 +5283,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5309,7 +5327,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5505,8 +5523,7 @@
/* end confdefs.h. */
#include
#include
-#include
-#include
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5835,7 +5852,7 @@
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5911,7 +5928,7 @@
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
+ as_fn_executable_p "$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
@@ -5977,7 +5994,7 @@
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
+ as_fn_executable_p "$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
@@ -6044,7 +6061,7 @@
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -6300,7 +6317,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6344,7 +6361,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6768,7 +6785,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6808,7 +6825,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7114,7 +7131,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7154,7 +7171,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7258,7 +7275,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7302,7 +7319,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7427,7 +7444,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7467,7 +7484,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7526,7 +7543,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7566,7 +7583,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8215,7 +8232,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8255,7 +8272,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8335,7 +8352,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8375,7 +8392,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8427,7 +8444,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8467,7 +8484,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8519,7 +8536,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8559,7 +8576,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8611,7 +8628,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8651,7 +8668,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8703,7 +8720,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8743,7 +8760,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16475,7 +16492,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16875,23 +16892,20 @@
/* end confdefs.h. */
$ac_includes_default
int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
+ int dir, dummy = 0;
+ if (! addr)
+ addr = &dummy;
+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+ return dir + dummy;
}
int
-main ()
+main (int argc, char **argv)
{
- return find_stack_direction () < 0;
+ return find_stack_direction (0, argc + !argv + 20) < 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -18964,7 +18978,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MYSQL_CONFIG=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -19672,6 +19686,47 @@
as_fn_error $? "$missing_library" "$LINENO" 5
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltinyxml" >&5
+$as_echo_n "checking for main in -ltinyxml... " >&6; }
+if ${ac_cv_lib_tinyxml_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltinyxml $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tinyxml_main=yes
+else
+ ac_cv_lib_tinyxml_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinyxml_main" >&5
+$as_echo "$ac_cv_lib_tinyxml_main" >&6; }
+if test "x$ac_cv_lib_tinyxml_main" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTINYXML 1
+_ACEOF
+
+ LIBS="-ltinyxml $LIBS"
+
+else
+ as_fn_error $? "$missing_library" "$LINENO" 5
+fi
+
@@ -19700,7 +19755,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -19743,7 +19798,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -20439,77 +20494,6 @@
INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TINYXML" >&5
-$as_echo_n "checking for TINYXML... " >&6; }
-
-if test -n "$TINYXML_CFLAGS"; then
- pkg_cv_TINYXML_CFLAGS="$TINYXML_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tinyxml\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tinyxml") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_TINYXML_CFLAGS=`$PKG_CONFIG --cflags "tinyxml" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$TINYXML_LIBS"; then
- pkg_cv_TINYXML_LIBS="$TINYXML_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tinyxml\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tinyxml") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_TINYXML_LIBS=`$PKG_CONFIG --libs "tinyxml" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- TINYXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tinyxml" 2>&1`
- else
- TINYXML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tinyxml" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$TINYXML_PKG_ERRORS" >&5
-
- as_fn_error $? "$missing_library" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "$missing_library" "$LINENO" 5
-else
- TINYXML_CFLAGS=$pkg_cv_TINYXML_CFLAGS
- TINYXML_LIBS=$pkg_cv_TINYXML_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"
-fi
-
# check for libbluray
case x$use_libbluray in #(
xyes) :
@@ -24048,7 +24032,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -24880,7 +24864,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_GAWK=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -24924,7 +24908,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_CMAKE=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -24967,7 +24951,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_GPERF=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25009,7 +24993,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_UNZIP=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25051,7 +25035,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_ZIP=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25094,7 +25078,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_NASM=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25137,7 +25121,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_GIT=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -25554,60 +25538,60 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
-
- struct s { _Bool s: 1; _Bool t; } s;
-
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) 0.5 == true ? 1 : -1];
- /* See body of main program for 'e'. */
- char f[(_Bool) 0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
- enum { j = false, k = true, l = false * true, m = true * 256 };
- /* The following fails for
- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
- _Bool n[m];
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
- /* Catch a bug in an HP-UX C compiler. See
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
- */
- _Bool q = true;
- _Bool *pq = &q;
+ #include
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
+
+ struct s { _Bool s: 1; _Bool t; } s;
+
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
int
main ()
{
- bool e = &s;
- *pq |= q;
- *pq |= ! q;
- /* Refer to every declared value, to avoid compiler optimizations. */
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
- + !m + !n + !o + !p + !q + !pq);
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
;
return 0;
@@ -25622,7 +25606,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
if test "x$ac_cv_type__Bool" = xyes; then :
cat >>confdefs.h <<_ACEOF
@@ -25632,6 +25616,7 @@
fi
+
if test $ac_cv_header_stdbool_h = yes; then
$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
@@ -25649,11 +25634,11 @@
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -25670,8 +25655,9 @@
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -25687,10 +25673,10 @@
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -26466,7 +26452,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -26588,7 +26574,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_GDC=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -26629,7 +26615,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_FPC=""yes""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27360,16 +27346,16 @@
# ... 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'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -27429,28 +27415,16 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -27472,7 +27446,7 @@
# values after options handling.
ac_log="
This file was extended by xbmc $as_me 11.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -27538,10 +27512,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
xbmc config.status 11.0
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -27632,7 +27606,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff -Nru xbmc-11.0~git20120423.cd20772/configure.in xbmc-11.0~git20120510.82388d5/configure.in
--- xbmc-11.0~git20120423.cd20772/configure.in 2012-04-23 19:54:13.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/configure.in 2012-05-10 21:32:14.000000000 +0000
@@ -719,6 +719,7 @@
AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
[INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="$LIBS $FONTCONFIG_LIBS"],
@@ -749,9 +750,6 @@
PKG_CHECK_MODULES([FREETYPE2], [freetype2],
[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([TINYXML], [tinyxml],
- [INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"],
- AC_MSG_ERROR($missing_library))
# check for libbluray
AS_CASE([x$use_libbluray],
diff -Nru xbmc-11.0~git20120423.cd20772/debian/changelog xbmc-11.0~git20120510.82388d5/debian/changelog
--- xbmc-11.0~git20120423.cd20772/debian/changelog 2012-04-23 20:02:21.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/debian/changelog 2012-05-10 21:42:40.000000000 +0000
@@ -1,3 +1,37 @@
+xbmc (2:11.0~git20120510.82388d5-1) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * New upload of Eden branch.
+ * Don't provide xbmc-live package anymore. (Closes: #668404)
+ (Closes: #671275) (Closes: #671668)
+ * Require libtinyxml-dev (>= 2.6.2).
+ * Include libmodplug library in Recommends.
+ * Make libcurl-gnutls a strict dependency for xbmc-bin.
+ * Add other recommended libraries used by xbmc.
+ * Alphabetize lists of recommended dependencies.
+ * Remove patches directory. All patches applied in Eden branch.
+
+ [ Piethein Strengholt ]
+ * remove live-scripts directory, part of #670482
+ * no longer copy the live-scripts dir when building
+ * live isn't a valid package in the control.in file
+ * remove other xbmc-live references, part of #670482
+
+ -- Andres Mejia Thu, 10 May 2012 17:37:39 -0400
+
+xbmc (2:11.0~git20120423.cd20772-2) unstable; urgency=low
+
+ * Add lsb-release to xbmc-live dependencies.
+ * Have xbmc-live depend on policykit-1. (Closes: #669727)
+ * Only enable builds for amd64, i386, and armhf.
+ * Update README.Debian file about packages that are built.
+ * Don't set release variable if no version number is available.
+ This fixes issue for Debian unstable which doesn't contain a version number.
+ * Remove unused release variable in postrm script.
+ * Set $release to 0 in case no version is given. (Closes: #670482)
+
+ -- Andres Mejia Wed, 02 May 2012 15:31:38 -0400
+
xbmc (2:11.0~git20120423.cd20772-1) experimental; urgency=low
* New upload of Eden branch to experimental.
diff -Nru xbmc-11.0~git20120423.cd20772/debian/control xbmc-11.0~git20120510.82388d5/debian/control
--- xbmc-11.0~git20120423.cd20772/debian/control 2012-04-23 20:02:21.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/debian/control 2012-05-10 22:13:46.000000000 +0000
@@ -78,7 +78,8 @@
libnfs-dev,
libltdl-dev,
libtiff4-dev | libtiff-dev,
- libtinyxml-dev,
+ libtinyxml-dev (>= 2.6.2),
+ libmp3lame-dev,
libavcodec-dev (>= 4:0.7),
libavfilter-dev (>= 4:0.7),
libavformat-dev (>= 4:0.7),
@@ -131,8 +132,9 @@
working XBMC.
Package: xbmc-bin
-Architecture: i386 amd64 powerpc ppc64 armel armhf
+Architecture: i386 amd64 armhf
Depends: ${shlibs:Depends},
+ ${dlopenlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
Provides: xbmc-common
@@ -158,37 +160,6 @@
.
This package contains all the binary data needed to have a working XBMC.
-Package: xbmc-live
-Architecture: all
-Depends: xbmc (= ${binary:Version}),
- openssh-server,
- ${python:Depends},
- python-apt,
- adduser,
- sudo,
- whois,
- ${misc:Depends},
-Conflicts: kdm, gdm, xdm, wdm
-Description: XBMC Media Center (XBMC Live package)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package is used to setup the XBMC Live environment.
-
Package: xbmc-eventclients-common
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
@@ -238,7 +209,7 @@
This is the Development package for XBMC Event Client.
Package: xbmc-eventclients-wiiremote
-Architecture: i386 amd64 powerpc ppc64 armel armhf
+Architecture: i386 amd64 armhf
Depends: xbmc-eventclients-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
diff -Nru xbmc-11.0~git20120423.cd20772/debian/patches/series xbmc-11.0~git20120510.82388d5/debian/patches/series
--- xbmc-11.0~git20120423.cd20772/debian/patches/series 2012-04-23 20:02:21.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# Patch in this directory are already applied in orig tarball.
diff -Nru xbmc-11.0~git20120423.cd20772/debian/patches/system-tinyxml.patch xbmc-11.0~git20120510.82388d5/debian/patches/system-tinyxml.patch
--- xbmc-11.0~git20120423.cd20772/debian/patches/system-tinyxml.patch 2012-04-23 20:02:21.000000000 +0000
+++ xbmc-11.0~git20120510.82388d5/debian/patches/system-tinyxml.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,2019 +0,0 @@
-Description: Patch to get xbmc building/running using system tinyxml.
-Author: Andres Mejia
-Forwarded: https://github.com/xbmc/xbmc/pull/619
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -26,7 +26,6 @@
- lib/libXDAAP/libxdaap.a \
- lib/libhts/libhts.a \
- lib/libsquish/libsquish.a \
-- lib/tinyXML/tinyxml.a \
- lib/xbmc-dll-symbols/dll-symbols.a \
- xbmc/addons/addons.a \
- xbmc/cdrip/cdrip.a \
-@@ -304,7 +303,6 @@
- lib/libXDAAP/libxdaap.a \
- lib/SlingboxLib/SlingboxLib.a
-
--
- OBJSXBMC =$(DIRECTORY_ARCHIVES)
- OBJSXBMC+=lib/libapetag/.libs/libapetag.a
-
---- a/configure.in
-+++ b/configure.in
-@@ -749,6 +749,9 @@
- PKG_CHECK_MODULES([FREETYPE2], [freetype2],
- [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
- AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([TINYXML], [tinyxml],
-+ [INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"],
-+ AC_MSG_ERROR($missing_library))
-
- # check for libbluray
- AS_CASE([x$use_libbluray],
---- a/xbmc/Application.cpp
-+++ b/xbmc/Application.cpp
-@@ -1830,7 +1830,7 @@
- CStdString skinFile = URIUtils::GetFileName(items[i]->GetPath());
- if (skinFile.Left(6).CompareNoCase("custom") == 0)
- {
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
- if (!xmlDoc.LoadFile(items[i]->GetPath()))
- {
- CLog::Log(LOGERROR, "unable to load:%s, Line %d\n%s", items[i]->GetPath().c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
---- a/xbmc/Favourites.cpp
-+++ b/xbmc/Favourites.cpp
-@@ -25,7 +25,7 @@
- #include "guilib/Key.h"
- #include "settings/Settings.h"
- #include "FileItem.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "utils/log.h"
- #include "utils/URIUtils.h"
- #include "settings/AdvancedSettings.h"
-@@ -52,7 +52,7 @@
-
- bool CFavourites::LoadFavourites(CStdString& strPath, CFileItemList& items)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- if (!doc.LoadFile(strPath))
- {
- CLog::Log(LOGERROR, "Unable to load %s (row %i column %i)", strPath.c_str(), doc.Row(), doc.Column());
-@@ -92,7 +92,7 @@
- bool CFavourites::Save(const CFileItemList &items)
- {
- CStdString favourites;
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- TiXmlElement xmlRootElement("favourites");
- TiXmlNode *rootNode = doc.InsertEndChild(xmlRootElement);
- if (!rootNode) return false;
---- a/xbmc/LangInfo.cpp
-+++ b/xbmc/LangInfo.cpp
-@@ -24,7 +24,7 @@
- #include "settings/GUISettings.h"
- #include "guilib/LocalizeStrings.h"
- #include "utils/log.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #ifdef _WIN32
- #include "utils/LangCodeExpander.h"
- #endif
-@@ -201,7 +201,7 @@
- {
- SetDefaults();
-
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
- if (!xmlDoc.LoadFile(strFileName))
- {
- CLog::Log(LOGERROR, "unable to load %s: %s at line %d", strFileName.c_str(), xmlDoc.ErrorDesc(), xmlDoc.ErrorRow());
---- a/xbmc/NfoFile.h
-+++ b/xbmc/NfoFile.h
-@@ -29,7 +29,7 @@
- #pragma once
- #endif // _MSC_VER > 1000
-
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "addons/Scraper.h"
- #include "utils/CharsetConverter.h"
-
-@@ -53,7 +53,7 @@
- template
- bool GetDetails(T& details,const char* document=NULL, bool prioritise=false)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- CStdString strDoc;
- if (document)
- strDoc = document;
---- a/xbmc/PasswordManager.cpp
-+++ b/xbmc/PasswordManager.cpp
-@@ -109,7 +109,7 @@
- CStdString passwordsFile = g_settings.GetUserDataItem("passwords.xml");
- if (XFILE::CFile::Exists(passwordsFile))
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- if (!doc.LoadFile(passwordsFile))
- {
- CLog::Log(LOGERROR, "%s - Unable to load: %s, Line %d\n%s",
-@@ -141,7 +141,7 @@
- if (!m_permanentCache.size())
- return;
-
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- TiXmlElement rootElement("passwords");
- TiXmlNode *root = doc.InsertEndChild(rootElement);
- if (!root)
---- a/xbmc/addons/Addon.cpp
-+++ b/xbmc/addons/Addon.cpp
-@@ -413,7 +413,7 @@
- bool CAddon::LoadUserSettings()
- {
- m_userSettingsLoaded = false;
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- if (doc.LoadFile(m_userSettingsPath))
- m_userSettingsLoaded = SettingsFromXML(doc);
- return m_userSettingsLoaded;
-@@ -438,7 +438,7 @@
- CDirectory::Create(strAddon);
-
- // create the XML file
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- SettingsToXML(doc);
- doc.SaveFile(m_userSettingsPath);
-
-@@ -463,7 +463,7 @@
- m_settings[key] = value;
- }
-
--bool CAddon::SettingsFromXML(const TiXmlDocument &doc, bool loadDefaults /*=false */)
-+bool CAddon::SettingsFromXML(const CXBMCTinyXML &doc, bool loadDefaults /*=false */)
- {
- if (!doc.RootElement())
- return false;
-@@ -495,7 +495,7 @@
- return foundSetting;
- }
-
--void CAddon::SettingsToXML(TiXmlDocument &doc) const
-+void CAddon::SettingsToXML(CXBMCTinyXML &doc) const
- {
- TiXmlElement node("settings");
- doc.InsertEndChild(node);
---- a/xbmc/addons/Addon.h
-+++ b/xbmc/addons/Addon.h
-@@ -22,7 +22,7 @@
-
- #include "IAddon.h"
- #include "addons/AddonVersion.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "Util.h"
- #include "URL.h"
- #include "guilib/LocalizeStrings.h"
-@@ -195,15 +195,15 @@
- \return true if settings are loaded, false otherwise
- \sa SettingsToXML
- */
-- bool SettingsFromXML(const TiXmlDocument &doc, bool loadDefaults = false);
-+ bool SettingsFromXML(const CXBMCTinyXML &doc, bool loadDefaults = false);
-
- /*! \brief Parse settings into an XML document
- \param doc XML document to receive the settings
- \sa SettingsFromXML
- */
-- void SettingsToXML(TiXmlDocument &doc) const;
-+ void SettingsToXML(CXBMCTinyXML &doc) const;
-
-- TiXmlDocument m_addonXmlDoc;
-+ CXBMCTinyXML m_addonXmlDoc;
- CStdString m_strLibName;
- bool m_settingsLoaded;
- bool m_userSettingsLoaded;
---- a/xbmc/addons/AddonInstaller.cpp
-+++ b/xbmc/addons/AddonInstaller.cpp
-@@ -283,7 +283,7 @@
- // TODO: possibly add support for github generated zips here?
- CStdString archive = URIUtils::AddFileToFolder(items[0]->GetPath(), "addon.xml");
-
-- TiXmlDocument xml;
-+ CXBMCTinyXML xml;
- AddonPtr addon;
- if (xml.LoadFile(archive) && CAddonMgr::Get().LoadAddonDescriptionFromMemory(xml.RootElement(), addon))
- {
---- a/xbmc/addons/AddonManager.cpp
-+++ b/xbmc/addons/AddonManager.cpp
-@@ -30,9 +30,8 @@
- #include "settings/GUISettings.h"
- #include "settings/AdvancedSettings.h"
- #include "utils/log.h"
--#include "tinyXML/tinyxml.h"
--
--
-+#include "utils/XBMCTinyXML.h"
-+#include "dialogs/GUIDialogYesNo.h"
- #ifdef HAS_VISUALISATION
- #include "Visualisation.h"
- #endif
---- a/xbmc/addons/Repository.cpp
-+++ b/xbmc/addons/Repository.cpp
-@@ -20,7 +20,7 @@
- */
-
- #include "Repository.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "filesystem/File.h"
- #include "AddonDatabase.h"
- #include "settings/Settings.h"
-@@ -130,7 +130,7 @@
- CSingleLock lock(m_critSection);
-
- VECADDONS result;
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
-
- CStdString file = m_info;
- if (m_compressed)
---- a/xbmc/addons/Scraper.cpp
-+++ b/xbmc/addons/Scraper.cpp
-@@ -182,7 +182,7 @@
- if (xml.IsEmpty())
- return true;
-
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(xml.c_str());
- m_userSettingsLoaded = SettingsFromXML(doc);
-
-@@ -195,7 +195,7 @@
- return "";
-
- stringstream stream;
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- SettingsToXML(doc);
- if (doc.RootElement())
- stream << *doc.RootElement();
-@@ -254,7 +254,7 @@
- if (!XMLUtils::HasUTF8Declaration(strXML))
- g_charsetConverter.unknownToUTF8(strXML);
-
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(strXML.c_str(),0,TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
-@@ -364,7 +364,7 @@
-
- if (CAddonMgr::Get().GetAddon((*itr).first, dep))
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- if (dep->Type() == ADDON_SCRAPER_LIBRARY && doc.LoadFile(dep->LibPath()))
- m_parser.AddDocument(&doc);
- }
-@@ -423,7 +423,7 @@
- // or ... or ...... on success
- for (unsigned int i=0; i < vcsOut.size(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(vcsOut[i], 0, TIXML_ENCODING_UTF8);
- CheckScraperError(doc.RootElement());
-
-@@ -517,7 +517,7 @@
- bool fResults(false);
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
-@@ -640,7 +640,7 @@
- // parse the returned XML into a vector of album objects
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- TiXmlHandle xhDoc(&doc);
-
-@@ -729,7 +729,7 @@
- // parse the returned XML into a vector of artist objects
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
-@@ -784,7 +784,7 @@
- // parse the XML response
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i);
- if (!doc.RootElement())
- {
-@@ -865,7 +865,7 @@
- bool fRet(false);
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
-@@ -900,7 +900,7 @@
- bool fRet(false);
- for (CStdStringArray::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
-@@ -936,7 +936,7 @@
- bool fRet(false);
- for (vector::const_iterator i = vcsOut.begin(); i != vcsOut.end(); ++i)
- {
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- doc.Parse(*i, 0, TIXML_ENCODING_UTF8);
- if (!doc.RootElement())
- {
---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
-+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
-@@ -27,8 +27,7 @@
- #endif
-
- #include "DllDvdNav.h"
--#include "tinyXML/tinyxml.h"
--
-+#include "utils/XBMCTinyXML.h"
- #include "DVDStateSerializer.h"
- #include
-
-@@ -50,7 +49,7 @@
- bool CDVDStateSerializer::DVDToXMLState( std::string &xmlstate, const dvd_state_t *state )
- {
- char buffer[256];
-- TiXmlDocument xmlDoc("navstate");
-+ CXBMCTinyXML xmlDoc("navstate");
-
- TiXmlElement eRoot("navstate");
- eRoot.SetAttribute("version", 1);
-@@ -212,7 +211,7 @@
-
- bool CDVDStateSerializer::XMLToDVDState( dvd_state_t *state, const std::string &xmlstate )
- {
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
-
- xmlDoc.Parse(xmlstate.c_str());
-
---- a/xbmc/cores/dvdplayer/Edl.cpp
-+++ b/xbmc/cores/dvdplayer/Edl.cpp
-@@ -26,7 +26,7 @@
- #include "filesystem/MythFile.h"
- #include "settings/AdvancedSettings.h"
- #include "utils/log.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "PlatformDefs.h"
-
- extern "C"
-@@ -504,7 +504,7 @@
- if (!CFile::Exists(beyondTVFilename))
- return false;
-
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
- if (!xmlDoc.LoadFile(beyondTVFilename))
- {
- CLog::Log(LOGERROR, "%s - Could not load Beyond TV file: %s. %s", __FUNCTION__, beyondTVFilename.c_str(),
---- a/xbmc/cores/playercorefactory/PlayerCoreConfig.h
-+++ b/xbmc/cores/playercorefactory/PlayerCoreConfig.h
-@@ -20,7 +20,7 @@
- *
- */
-
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "cores/IPlayer.h"
- #include "PlayerCoreFactory.h"
- #include "cores/dvdplayer/DVDPlayer.h"
---- a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
-+++ b/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
-@@ -26,7 +26,7 @@
- #include "settings/GUISettings.h"
- #include "utils/log.h"
- #include "utils/RegExp.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
-
- CPlayerSelectionRule::CPlayerSelectionRule(TiXmlElement* pRule)
- {
---- a/xbmc/dialogs/GUIDialogPlayEject.cpp
-+++ b/xbmc/dialogs/GUIDialogPlayEject.cpp
-@@ -115,7 +115,7 @@
-
- // Figure out Line 2 of the dialog
- CStdString strLine2;
-- TiXmlDocument discStubXML;
-+ CXBMCTinyXML discStubXML;
- if (discStubXML.LoadFile(item.GetPath()))
- {
- TiXmlElement * pRootElement = discStubXML.RootElement();
---- a/xbmc/filesystem/DAVDirectory.cpp
-+++ b/xbmc/filesystem/DAVDirectory.cpp
-@@ -197,7 +197,7 @@
- CStdString strResponse;
- dav.ReadData(strResponse);
-
-- TiXmlDocument davResponse;
-+ CXBMCTinyXML davResponse;
- davResponse.Parse(strResponse.c_str());
-
- if (!davResponse.Parse(strResponse))
---- a/xbmc/filesystem/DAVDirectory.h
-+++ b/xbmc/filesystem/DAVDirectory.h
-@@ -21,7 +21,7 @@
- */
-
- #include "IDirectory.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "FileItem.h"
-
- namespace XFILE
---- a/xbmc/filesystem/DirectoryTuxBox.cpp
-+++ b/xbmc/filesystem/DirectoryTuxBox.cpp
-@@ -26,7 +26,7 @@
- #include "utils/HttpHeader.h"
- #include "utils/TuxBoxUtil.h"
- #include "URL.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "settings/AdvancedSettings.h"
- #include "FileItem.h"
- #include "utils/log.h"
-@@ -131,7 +131,7 @@
- http.Close();
-
- // parse returned xml
-- TiXmlDocument doc;
-+ CXBMCTinyXML doc;
- data.Replace(">-. error: <%d>", strPath.c_str(), xmlDoc.ErrorId());
---- a/xbmc/filesystem/RTVDirectory.cpp
-+++ b/xbmc/filesystem/RTVDirectory.cpp
-@@ -27,7 +27,7 @@
- #include "utils/URIUtils.h"
- #include "SectionLoader.h"
- #include "URL.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "FileItem.h"
-
- using namespace XFILE;
-@@ -135,7 +135,7 @@
- rtv_get_guide_xml(&data, strHostAndPort.c_str());
-
- // Begin parsing the XML data
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
- xmlDoc.Parse( (const char *) data );
- if ( xmlDoc.Error() )
- {
---- a/xbmc/filesystem/Slingbox.cpp
-+++ b/xbmc/filesystem/Slingbox.cpp
-@@ -521,7 +521,7 @@
- }
-
- // Load the XML file
-- TiXmlDocument slingboxXML;
-+ CXBMCTinyXML slingboxXML;
- if (!slingboxXML.LoadFile(slingboxXMLFile))
- {
- CLog::Log(LOGERROR, "%s - Error loading %s - line %d\n%s", __FUNCTION__,
---- a/xbmc/guilib/GUIAudioManager.cpp
-+++ b/xbmc/guilib/GUIAudioManager.cpp
-@@ -29,7 +29,7 @@
- #include "input/ButtonTranslator.h"
- #include "threads/SingleLock.h"
- #include "utils/URIUtils.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
- #include "addons/Skin.h"
- #ifdef HAS_SDL_AUDIO
- #include
-@@ -312,7 +312,7 @@
- CStdString strSoundsXml = URIUtils::AddFileToFolder(m_strMediaDir, "sounds.xml");
-
- // Load our xml file
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
-
- CLog::Log(LOGINFO, "Loading %s", strSoundsXml.c_str());
-
---- a/xbmc/guilib/GUIBaseContainer.cpp
-+++ b/xbmc/guilib/GUIBaseContainer.cpp
-@@ -30,7 +30,7 @@
- #include "GUIStaticItem.h"
- #include "Key.h"
- #include "utils/MathUtils.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
-
- using namespace std;
-
---- a/xbmc/guilib/GUIColorManager.cpp
-+++ b/xbmc/guilib/GUIColorManager.cpp
-@@ -24,7 +24,7 @@
- #include "addons/Skin.h"
- #include "utils/log.h"
- #include "utils/URIUtils.h"
--#include "tinyXML/tinyxml.h"
-+#include "utils/XBMCTinyXML.h"
-
- CGUIColorManager g_colorManager;
-
-@@ -48,7 +48,7 @@
- Clear();
-
- // load the global color map if it exists
-- TiXmlDocument xmlDoc;
-+ CXBMCTinyXML xmlDoc;
- if (xmlDoc.LoadFile(PTH_IC("special://xbmc/system/colors.xml")))
- LoadXML(xmlDoc);
-
-@@ -71,7 +71,7 @@
- LoadXML(xmlDoc);
- }
-
--bool CGUIColorManager::LoadXML(TiXmlDocument &xmlDoc)
-+bool CGUIColorManager::LoadXML(CXBMCTinyXML &xmlDoc)
- {
- TiXmlElement* pRootElement = xmlDoc.RootElement();
-
---- a/xbmc/guilib/GUIColorManager.h
-+++ b/xbmc/guilib/GUIColorManager.h
-@@ -38,7 +38,7 @@
-
- #include