1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
diff -Naur xbmc-9.11-8/configure.in xbmc-9.11/configure.in
--- xbmc-9.11-8/configure.in 2010-01-21 14:04:04.000000000 +0100
+++ xbmc-9.11/configure.in 2010-01-21 18:58:26.000000000 +0100
@@ -59,6 +59,8 @@
external_libogg_disabled="== Use of external libogg disabled. =="
external_libwavpack_enabled="== Use of external libwavpack enabled. =="
external_libwavpack_disabled="== Use of external libwavpack disabled. =="
+external_libz_enabled="== Use of external libz enabled. =="
+external_libz_disabled="== Use of external libz disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -223,6 +225,12 @@
[use_external_libwavpack=$enableval],
[use_external_libwavpack=no])
+AC_ARG_ENABLE([external-libz],
+ [AS_HELP_STRING([--enable-external-libz],
+ [enable use of external libz library (default is no)])],
+ [use_external_libz=$enableval],
+ [use_external_libz=no])
+
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -611,6 +619,18 @@
USE_EXTERNAL_LIBWAVPACK=0
fi
+# External libz
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
+ AC_MSG_NOTICE($external_libz_enabled)
+ USE_EXTERNAL_LIBZ=1
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
+else
+ AC_MSG_NOTICE($external_libz_disabled)
+ USE_EXTERNAL_LIBZ=0
+fi
+
# External Python
if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],,
@@ -1276,7 +1296,7 @@
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure
fi
-], [0])
+], [$USE_EXTERNAL_LIBZ])
XB_CONFIG_MODULE([xbmc/lib/libass], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-9.11-8/xbmc/FileSystem/FileZip.h xbmc-9.11/xbmc/FileSystem/FileZip.h
--- xbmc-9.11-8/xbmc/FileSystem/FileZip.h 2009-09-23 05:50:54.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/FileZip.h 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "IFile.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "utils/log.h"
#include "GUIWindowManager.h"
#include "FileSystem/File.h"
diff -Naur xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp
--- xbmc-9.11-8/xbmc/FileSystem/ZipDirectory.cpp 2009-10-14 00:53:03.000000000 +0200
+++ xbmc-9.11/xbmc/FileSystem/ZipDirectory.cpp 2010-01-21 16:48:18.000000000 +0100
@@ -23,7 +23,7 @@
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "Util.h"
-#include "lib/zlib/zlib.h"
+#include <zlib.h>
#include "URL.h"
#include "ZipManager.h"
#include "FileItem.h"
|
