1 diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
2 --- xbmc-10.0.orig/configure.in 2010-12-21 18:31:22.222999999 +0100
3 +++ xbmc-10.0/configure.in 2010-12-21 19:07:25.468000001 +0100
7 [AS_HELP_STRING([--disable-hal],
8 - [disable HAL support (default is enabled if hal and hal-storage is found)])],
9 + [disable HAL support (default is enabled if hal and hal-storage is founC_CONFIG_COMMANDS_POSTd)])],
14 AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
15 AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
16 PKG_CHECK_MODULES([MAD], [mad],
17 - [INCLUDES="$INCLUDES $MAD_CFLAGS"; LIBS="$LIBS $MAD_LIBS"],
18 + [INCLUDES="${INCLUDES} $MAD_CFLAGS"; LIBS="${LIBS} $MAD_LIBS"],
19 AC_MSG_ERROR($missing_library))
20 PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
21 - [INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="$LIBS $FONTCONFIG_LIBS"],
22 + [INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="${LIBS} $FONTCONFIG_LIBS"],
23 AC_MSG_ERROR($missing_library))
24 PKG_CHECK_MODULES([FRIBIDI], [fribidi],
25 - [INCLUDES="$INCLUDES $FRIBIDI_CFLAGS"; LIBS="$LIBS $FRIBIDI_LIBS"],
26 + [INCLUDES="${INCLUDES} $FRIBIDI_CFLAGS"; LIBS="${LIBS} $FRIBIDI_LIBS"],
27 AC_MSG_ERROR($missing_library))
28 PKG_CHECK_MODULES([SQLITE3], [sqlite3],
29 - [INCLUDES="$INCLUDES $SQLITE3_CFLAGS"; LIBS="$LIBS $SQLITE3_LIBS"],
30 + [INCLUDES="${INCLUDES} $SQLITE3_CFLAGS"; LIBS="${LIBS} $SQLITE3_LIBS"],
31 AC_MSG_ERROR($missing_library))
32 PKG_CHECK_MODULES([PNG], [libpng],
33 - [INCLUDES="$INCLUDES $PNG_CFLAGS"; LIBS="$LIBS $PNG_LIBS"],
34 + [INCLUDES="${INCLUDES} $PNG_CFLAGS"; LIBS="${LIBS} $PNG_LIBS"],
35 AC_MSG_ERROR($missing_library))
36 PKG_CHECK_MODULES([PCRE], [libpcre],
37 - [INCLUDES="$INCLUDES $PCRE_CFLAGS"; LIBS="$LIBS $PCRE_LIBS"]; \
38 + [INCLUDES="${INCLUDES} $PCRE_CFLAGS"; LIBS="${LIBS} $PCRE_LIBS"]; \
39 AC_DEFINE([HAVE_LIBPCRE],[1],["Define to 1 if libpcre is installed"]),
40 AC_MSG_ERROR($missing_library))
41 PKG_CHECK_MODULES([PCRECPP], [libpcrecpp],
42 - [INCLUDES="$INCLUDES $PCRECPP_CFLAGS"; LIBS="$LIBS $PCRECPP_LIBS"]; \
43 + [INCLUDES="${INCLUDES} $PCRECPP_CFLAGS"; LIBS="${LIBS} $PCRECPP_LIBS"]; \
44 AC_DEFINE([HAVE_LIBPCRECPP],[1],["Define to 1 if libpcrecpp is installed"]),
45 AC_MSG_ERROR($missing_library))
46 PKG_CHECK_MODULES([CDIO], [libcdio],
47 - [INCLUDES="$INCLUDES $CDIO_CFLAGS"; LIBS="$LIBS $CDIO_LIBS"],
48 + [INCLUDES="${INCLUDES} $CDIO_CFLAGS"; LIBS="${LIBS} $CDIO_LIBS"],
49 AC_MSG_ERROR($missing_library))
50 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
51 - [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
52 + [INCLUDES="${INCLUDES} $SAMPLERATE_CFLAGS"; LIBS="${LIBS} $SAMPLERATE_LIBS"],
53 AC_MSG_ERROR($missing_library))
54 PKG_CHECK_MODULES([MMS], [libmms],
55 - [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"],
56 + [INCLUDES="${INCLUDES} $MMS_CFLAGS"; LIBS="${LIBS} $MMS_LIBS"],
57 AC_MSG_ERROR($missing_library))
58 PKG_CHECK_MODULES([FREETYPE2], [freetype2],
59 - [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
60 + [INCLUDES="${INCLUDES} $FREETYPE2_CFLAGS"; LIBS="${LIBS} $FREETYPE2_LIBS"],
61 AC_MSG_ERROR($missing_library))
62 PKG_CHECK_MODULES([OGG], [ogg],
63 - [INCLUDES="$INCLUDES $OGG_CFLAGS"; LIBS="$LIBS $OGG_LIBS"],
64 + [INCLUDES="${INCLUDES} $OGG_CFLAGS"; LIBS="${LIBS} $OGG_LIBS"],
65 AC_MSG_ERROR($missing_library))
66 PKG_CHECK_MODULES([VORBIS], [vorbis],
67 - [INCLUDES="$INCLUDES $VORBIS_CFLAGS"; LIBS="$LIBS $VORBIS_LIBS"],
68 + [INCLUDES="${INCLUDES} $VORBIS_CFLAGS"; LIBS="${LIBS} $VORBIS_LIBS"],
69 AC_MSG_ERROR($missing_library))
70 PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
71 - [INCLUDES="$INCLUDES $VORBISENC_CFLAGS"; LIBS="$LIBS $VORBISENC_LIBS"],
72 + [INCLUDES="${INCLUDES} $VORBISENC_CFLAGS"; LIBS="${LIBS} $VORBISENC_LIBS"],
73 AC_MSG_ERROR($missing_library))
78 AS_CASE([x$use_libbluray],
80 - INCLUDES="$INCLUDES $LIBBLURAY_CFLAGS";
81 + INCLUDES="${INCLUDES} $LIBBLURAY_CFLAGS";
82 if test "$host_vendor" != "apple"; then
83 XB_FIND_SONAME([BLURAY], [bluray], [use_libbluray])
86 AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
87 AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
88 PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
89 - [INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
90 + [INCLUDES="${INCLUDES} $VORBISFILE_CFLAGS"; LIBS="${LIBS} $VORBISFILE_LIBS"],
91 AC_MSG_ERROR($missing_library))
93 AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
94 if test $MYSQL_CONFIG = "yes"; then
95 - INCLUDES="$INCLUDES `mysql_config --include`"
96 - LIBS="$LIBS `mysql_config --libs`"
97 + INCLUDES="${INCLUDES} `mysql_config --include`"
98 + LIBS="${LIBS} `mysql_config --libs`"
100 AC_MSG_ERROR($missing_program)
102 @@ -652,34 +652,34 @@
103 AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library))
105 PKG_CHECK_MODULES([ALSA], [alsa],
106 - [INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"],
107 + [INCLUDES="${INCLUDES} $ALSA_CFLAGS"; LIBS="${LIBS} $ALSA_LIBS"],
108 AC_MSG_ERROR($missing_library))
109 PKG_CHECK_MODULES([ENCA], [enca],
110 - [INCLUDES="$INCLUDES $ENCA_CFLAGS"; LIBS="$LIBS $ENCA_LIBS"],
111 + [INCLUDES="${INCLUDES} $ENCA_CFLAGS"; LIBS="${LIBS} $ENCA_LIBS"],
112 AC_MSG_ERROR($missing_library))
113 PKG_CHECK_MODULES([XT], [xt],
114 - [INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
115 + [INCLUDES="${INCLUDES} $XT_CFLAGS"; LIBS="${LIBS} $XT_LIBS"],
116 AC_MSG_ERROR($missing_library))
117 PKG_CHECK_MODULES([XTST], [xtst],
118 - [INCLUDES="$INCLUDES $XTST_CFLAGS"; LIBS="$LIBS $XTST_LIBS"],
119 + [INCLUDES="${INCLUDES} $XTST_CFLAGS"; LIBS="${LIBS} $XTST_LIBS"],
120 AC_MSG_ERROR($missing_library))
121 PKG_CHECK_MODULES([XEXT], [xext],
122 - [INCLUDES="$INCLUDES $XEXT_CFLAGS"; LIBS="$LIBS $XEXT_LIBS"],
123 + [INCLUDES="${INCLUDES} $XEXT_CFLAGS"; LIBS="${LIBS} $XEXT_LIBS"],
124 AC_MSG_ERROR($missing_library))
125 PKG_CHECK_MODULES([XMU], [xmu],
126 - [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
127 + [INCLUDES="${INCLUDES} $XMU_CFLAGS"; LIBS="${LIBS} $XMU_LIBS"],
128 AC_MSG_ERROR($missing_library))
129 PKG_CHECK_MODULES([XINERAMA],[xinerama],
130 - [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
131 + [INCLUDES="${INCLUDES} $XINERAMA_CFLAGS"; LIBS="${LIBS} $XINERAMA_LIBS"],
132 AC_MSG_ERROR($missing_library))
133 PKG_CHECK_MODULES([CURL], [libcurl],
134 - [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
135 + [INCLUDES="${INCLUDES} $CURL_CFLAGS"; LIBS="${LIBS} $CURL_LIBS"],
136 AC_MSG_ERROR($missing_library))
137 PKG_CHECK_MODULES([DBUS], [dbus-1],
138 - [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"],
139 + [INCLUDES="${INCLUDES} $DBUS_CFLAGS"; LIBS="${LIBS} $DBUS_LIBS"],
140 AC_MSG_ERROR($missing_library))
141 PKG_CHECK_MODULES([SDL], [sdl],
142 - [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"],
143 + [INCLUDES="${INCLUDES} $SDL_CFLAGS"; LIBS="${LIBS} $SDL_LIBS"],
144 AC_MSG_ERROR($missing_library))
147 @@ -754,10 +754,10 @@
149 if test "$use_hal" = "yes"; then
150 PKG_CHECK_MODULES([HAL], [hal],
151 - [INCLUDES="$INCLUDES $HAL_CFLAGS"; LIBS="$LIBS $HAL_LIBS"],
152 + [INCLUDES="${INCLUDES} $HAL_CFLAGS"; LIBS="${LIBS} $HAL_LIBS"],
153 use_hal=no;AC_MSG_RESULT($hal_not_found))
154 PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage],
155 - [INCLUDES="$INCLUDES $HAL_STORAGE_CFLAGS"; LIBS="$LIBS $HAL_STORAGE_LIBS"],
156 + [INCLUDES="${INCLUDES} $HAL_STORAGE_CFLAGS"; LIBS="${LIBS} $HAL_STORAGE_LIBS"],
157 use_hal=no;AC_MSG_RESULT($halstorage_not_found))
159 AC_MSG_RESULT($hal_disabled)
162 if test "$use_external_ffmpeg" = "yes"; then
163 PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat libavutil libpostproc libswscale],
164 - [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"],
165 + [INCLUDES="${INCLUDES} $FFMPEG_CFLAGS"; LIBS="${LIBS} $FFMPEG_LIBS"],
166 AC_MSG_ERROR($missing_library))
168 # Determine whether AVPacket and relevant functions are defined in libavformat
169 @@ -1055,7 +1055,7 @@
170 AC_DEFINE([HAVE_LIBOPENMAX], [1], [Define to 1 if you have the 'OpenMax' library.]),
171 use_openmax=no;AC_MSG_RESULT($openmax_not_found))
172 if test "$use_openmax" = "yes"; then
173 - INCLUDES="$INCLUDES -I/usr/include/OpenMAX/IL"
174 + INCLUDES="${INCLUDES} -I/usr/include/OpenMAX/IL"
177 AC_MSG_NOTICE($openmax_disabled)
178 @@ -1219,9 +1219,9 @@
181 if test -d "/usr/include/lzo"; then
182 - INCLUDES="$INCLUDES -I/usr/include/lzo"
183 + INCLUDES="${INCLUDES} -I/usr/include/lzo"
185 - INCLUDES="$INCLUDES"
186 + INCLUDES="${INCLUDES}"
189 if test "x$use_ccache" != "xno"; then