1 --- xbmc-9.11-b1/configure.in.wiget 2009-12-08 20:04:30.000000000 +0100
2 +++ xbmc-9.11-b1/configure.in 2009-12-08 20:13:04.000000000 +0100
3 @@ -334,41 +334,41 @@ AC_CHECK_LIB([z], [main],, AC_
4 AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
5 AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
6 PKG_CHECK_MODULES([MAD], [mad],
7 - [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
8 + [INCLUDES="${INCLUDES} $MAD_CFLAGS"; LIBS="${LIBS} $MAD_LIBS"],
9 AC_MSG_ERROR($missing_library))
10 PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
11 - [INCLUDES+=" $FONTCONFIG_CFLAGS"; LIBS+=" $FONTCONFIG_LIBS"],
12 + [INCLUDES="${INCLUDES} $FONTCONFIG_CFLAGS"; LIBS="${LIBS} $FONTCONFIG_LIBS"],
13 AC_MSG_ERROR($missing_library))
14 PKG_CHECK_MODULES([FRIBIDI], [fribidi],
15 - [INCLUDES+=" $FRIBIDI_CFLAGS"; LIBS+=" $FRIBIDI_LIBS"],
16 + [INCLUDES="${INCLUDES} $FRIBIDI_CFLAGS"; LIBS="${LIBS} $FRIBIDI_LIBS"],
17 AC_MSG_ERROR($missing_library))
18 PKG_CHECK_MODULES([SQLITE3], [sqlite3],
19 - [INCLUDES+=" $SQLITE3_CFLAGS"; LIBS+=" $SQLITE3_LIBS"],
20 + [INCLUDES="${INCLUDES} $SQLITE3_CFLAGS"; LIBS="${LIBS} $SQLITE3_LIBS"],
21 AC_MSG_ERROR($missing_library))
22 PKG_CHECK_MODULES([PNG], [libpng],
23 - [INCLUDES+=" $PNG_CFLAGS"; LIBS+=" $PNG_LIBS"],
24 + [INCLUDES="${INCLUDES} $PNG_CFLAGS"; LIBS="${LIBS} $PNG_LIBS"],
25 AC_MSG_ERROR($missing_library))
26 PKG_CHECK_MODULES([PCRE], [libpcre],
27 - [INCLUDES+=" $PCRE_CFLAGS"; LIBS+=" $PCRE_LIBS"]; \
28 + [INCLUDES="${INCLUDES} $PCRE_CFLAGS"; LIBS="${LIBS} $PCRE_LIBS"]; \
29 AC_DEFINE([HAVE_LIBPCRE],[1],["Define to 1 if libpcre is installed"]),
30 AC_MSG_ERROR($missing_library))
31 PKG_CHECK_MODULES([CDIO], [libcdio],
32 - [INCLUDES+=" $CDIO_CFLAGS"; LIBS+=" $CDIO_LIBS"],
33 + [INCLUDES="${INCLUDES} $CDIO_CFLAGS"; LIBS="${LIBS} $CDIO_LIBS"],
34 AC_MSG_ERROR($missing_library))
35 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
36 - [INCLUDES+=" $SAMPLERATE_CFLAGS"; LIBS+=" $SAMPLERATE_LIBS"],
37 + [INCLUDES="${INCLUDES} $SAMPLERATE_CFLAGS"; LIBS="${LIBS} $SAMPLERATE_LIBS"],
38 AC_MSG_ERROR($missing_library))
39 PKG_CHECK_MODULES([MMS], [libmms],
40 - [INCLUDES+=" $MMS_CFLAGS"; LIBS+=" $MMS_LIBS"],
41 + [INCLUDES="${INCLUDES} $MMS_CFLAGS"; LIBS="${LIBS} $MMS_LIBS"],
42 AC_MSG_ERROR($missing_library))
43 PKG_CHECK_MODULES([FREETYPE2], [freetype2],
44 - [INCLUDES+=" $FREETYPE2_CFLAGS"; LIBS+=" $FREETYPE2_LIBS"],
45 + [INCLUDES="${INCLUDES} $FREETYPE2_CFLAGS"; LIBS="${LIBS} $FREETYPE2_LIBS"],
46 AC_MSG_ERROR($missing_library))
47 PKG_CHECK_MODULES([OGG], [ogg],
48 - [INCLUDES+=" $OGG_CFLAGS"; LIBS+=" $OGG_LIBS"],
49 + [INCLUDES="${INCLUDES} $OGG_CFLAGS"; LIBS="${LIBS} $OGG_LIBS"],
50 AC_MSG_ERROR($missing_library))
51 PKG_CHECK_MODULES([VORBIS], [vorbis],
52 - [INCLUDES+=" $VORBIS_CFLAGS"; LIBS+=" $VORBIS_LIBS"],
53 + [INCLUDES="${INCLUDES} $VORBIS_CFLAGS"; LIBS="${LIBS} $VORBIS_LIBS"],
54 AC_MSG_ERROR($missing_library))
56 # platform dependent libraries
57 @@ -376,10 +376,10 @@ if test "$host_vendor" = "apple" ; then
58 AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
59 AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
60 PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
61 - [INCLUDES+=" $VORBISFILE_CFLAGS"; LIBS+=" $VORBISFILE_LIBS"],
62 + [INCLUDES="${INCLUDES} $VORBISFILE_CFLAGS"; LIBS="${LIBS} $VORBISFILE_LIBS"],
63 AC_MSG_ERROR($missing_library))
64 PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
65 - [INCLUDES+=" $VORBISENC_CFLAGS"; LIBS+=" $VORBISENC_LIBS"],
66 + [INCLUDES="${INCLUDES} $VORBISENC_CFLAGS"; LIBS="${LIBS} $VORBISENC_LIBS"],
67 AC_MSG_ERROR($missing_library))
69 AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library))
70 @@ -394,37 +394,37 @@ else
71 AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library))
73 PKG_CHECK_MODULES([ALSA], [alsa],
74 - [INCLUDES+=" $ALSA_CFLAGS"; LIBS+=" $ALSA_LIBS"],
75 + [INCLUDES="${INCLUDES} $ALSA_CFLAGS"; LIBS="${LIBS} $ALSA_LIBS"],
76 AC_MSG_ERROR($missing_library))
77 PKG_CHECK_MODULES([ENCA], [enca],
78 - [INCLUDES+=" $ENCA_CFLAGS"; LIBS+=" $ENCA_LIBS"],
79 + [INCLUDES="${INCLUDES} $ENCA_CFLAGS"; LIBS="${LIBS} $ENCA_LIBS"],
80 AC_MSG_ERROR($missing_library))
81 PKG_CHECK_MODULES([XT], [xt],
82 - [INCLUDES+=" $XT_CFLAGS"; LIBS+=" $XT_LIBS"],
83 + [INCLUDES="${INCLUDES} $XT_CFLAGS"; LIBS="${LIBS} $XT_LIBS"],
84 AC_MSG_ERROR($missing_library))
85 PKG_CHECK_MODULES([XTST], [xtst],
86 - [INCLUDES+=" $XTST_CFLAGS"; LIBS+=" $XTST_LIBS"],
87 + [INCLUDES="${INCLUDES} $XTST_CFLAGS"; LIBS="${LIBS} $XTST_LIBS"],
88 AC_MSG_ERROR($missing_library))
89 PKG_CHECK_MODULES([XMU], [xmu],
90 - [INCLUDES+=" $XMU_CFLAGS"; LIBS+=" $XMU_LIBS"],
91 + [INCLUDES="${INCLUDES} $XMU_CFLAGS"; LIBS="${LIBS} $XMU_LIBS"],
92 AC_MSG_ERROR($missing_library))
93 PKG_CHECK_MODULES([XINERAMA], [xinerama],
94 - [INCLUDES+=" $XINERAMA_CFLAGS"; LIBS+=" $XINERAMA_LIBS"],
95 + [INCLUDES="${INCLUDES} $XINERAMA_CFLAGS"; LIBS="${LIBS} $XINERAMA_LIBS"],
96 AC_MSG_ERROR($missing_library))
97 PKG_CHECK_MODULES([CURL], [libcurl],
98 - [INCLUDES+=" $CURL_CFLAGS"; LIBS+=" $CURL_LIBS"],
99 + [INCLUDES="${INCLUDES} $CURL_CFLAGS"; LIBS="${LIBS} $CURL_LIBS"],
100 AC_MSG_ERROR($missing_library))
101 PKG_CHECK_MODULES([DBUS], [dbus-1],
102 - [INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"],
103 + [INCLUDES="${INCLUDES} $DBUS_CFLAGS"; LIBS="${LIBS} $DBUS_LIBS"],
104 AC_MSG_ERROR($missing_library))
105 PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage],
106 - [INCLUDES+=" $HAL_STORAGE_CFLAGS"; LIBS+=" $HAL_STORAGE_LIBS"],
107 + [INCLUDES="${INCLUDES} $HAL_STORAGE_CFLAGS"; LIBS="${LIBS} $HAL_STORAGE_LIBS"],
108 AC_MSG_ERROR($missing_library))
109 PKG_CHECK_MODULES([SDL], [sdl],
110 - [INCLUDES+=" $SDL_CFLAGS"; LIBS+=" $SDL_LIBS"],
111 + [INCLUDES="${INCLUDES} $SDL_CFLAGS"; LIBS="${LIBS} $SDL_LIBS"],
112 AC_MSG_ERROR($missing_library))
113 PKG_CHECK_MODULES([HAL], [hal],
114 - [INCLUDES+=" $HAL_CFLAGS"; LIBS+=" $HAL_LIBS"],
115 + [INCLUDES="${INCLUDES} $HAL_CFLAGS"; LIBS="${LIBS} $HAL_LIBS"],
116 AC_MSG_ERROR($missing_library))
119 @@ -1053,13 +1053,14 @@ AC_DEFUN([XB_CONFIG_MODULE],[
120 AC_CONFIG_COMMANDS_POST([
121 if [[ $3 != "1" ]]; then
127 if [[ $? -ne 0 ]]; then
130 AC_MSG_ERROR([[Submodule $1 failed to configure]])
136 AC_MSG_ERROR([[Submodule $1 doesn't exist]])