3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- xine-lib-1.1.0/configure.ac~configure-1.0
7 +++ xine-lib-1.1.0/configure.ac
11 AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
12 +AM_CONDITIONAL(HAVE_XV, test x$ac_have_xvfoo = "xyes")
17 AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
20 -AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
21 +AM_CONDITIONAL(HAVE_AA, [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
23 dnl ---------------------------------------------
24 dnl Checks for Color AsCii Art library
27 dnl ---------------------------------------------
30 - AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
32 -AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
33 +AM_CONDITIONAL(HAVE_SDL, 0)
36 dnl ---------------------------------------------
37 @@ -1013,48 +1011,22 @@
39 dnl ---------------------------------------------
42 - [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
43 - AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
45 - AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
46 -AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
47 +AM_CONDITIONAL(HAVE_THEORA, 0)
50 dnl ---------------------------------------------
52 dnl ---------------------------------------------
54 -PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
56 -if test "x$no_speex" = "xyes" ; then
57 - AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
60 -if test "x$no_speex" = "xyes" ; then
61 - AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
63 - AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
65 - dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
66 - dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
67 - AC_CHECK_HEADER([speex/speex.h],
68 - AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
71 - AC_SUBST(SPEEX_CFLAGS)
72 - AC_SUBST(SPEEX_LIBS)
74 -AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
75 +AM_CONDITIONAL(HAVE_SPEEX, 0)
78 dnl ---------------------------------------------
80 dnl ---------------------------------------------
83 - AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
84 -AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
85 +AM_CONDITIONAL(HAVE_FLAC, 0)
88 dnl ---------------------------------------------
89 dnl External version of a52dec
90 @@ -1120,13 +1092,8 @@
92 dnl ---------------------------------------------
94 -AC_CHECK_LIB(mng, mng_initialize,
95 - [ AC_CHECK_HEADER(libmng.h,
98 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
99 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
100 -AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
102 +AM_CONDITIONAL(HAVE_LIBMNG, 0)
105 dnl ---------------------------------------------
106 @@ -1153,7 +1120,7 @@
108 dnl ---------------------------------------------
111 +AM_CONDITIONAL(HAVE_FT2, 0)
114 dnl ---------------------------------------------
115 @@ -1196,37 +1163,21 @@
117 dnl ---------------------------------------------
120 - AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
121 - AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
122 -AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
123 +AM_CONDITIONAL(HAVE_ESD, 0)
126 dnl ---------------------------------------------
128 dnl ---------------------------------------------
131 - AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
132 - AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
133 -AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
134 +AM_CONDITIONAL(HAVE_ARTS, 0)
137 dnl ---------------------------------------------
138 dnl gnome-vfs support
139 dnl ---------------------------------------------
141 -PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
144 -AC_SUBST(GNOME_VFS_CFLAGS)
145 -AC_SUBST(GNOME_VFS_LIBS)
146 -if test x"$no_gnome_vfs" != "xyes"; then
147 -AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
149 -AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
151 -AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
152 +AM_CONDITIONAL(HAVE_GNOME_VFS, 0)
155 dnl ---------------------------------------------
156 @@ -1403,75 +1354,7 @@
158 AC_MSG_RESULT($ISOC99_PRAGMA)
163 - AC_MSG_CHECKING([bitfield ordering in structs])
165 - dnl basic compile test for all platforms
166 - AC_COMPILE_IFELSE([
168 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
169 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
170 - __attribute__((packed))
173 - switch (0) case 0: case sizeof(bf) == 1:;
176 -], [], AC_MSG_ERROR([compiler doesn't support bitfield structs]))
182 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
183 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
184 - __attribute__((packed))
187 - if (sizeof (bf) != 1) return 1;
188 - return *((unsigned char*) &bf) != 0x4b; }
192 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
193 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
194 - __attribute__((packed))
197 - if (sizeof (bf) != 1) return 1;
198 - return *((unsigned char*) &bf) != 0xa5; }
199 -], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering]))
202 - *-*-mingw32* | *-*-cygwin*)
206 - AC_MSG_RESULT([unknown])
207 - AC_MSG_ERROR([value of bitfield test isn't known for $host
208 -*********************************************************************
209 -Value of bitfield test can't be found out for cross-compiling and we
210 -don't know its value for host "$host".
212 -Because it's needed for VCD plugin, disable VCD by configure option
213 ---disable-vcd or use external VCD library.
214 -*********************************************************************])
218 - if test "x$cross_compiling" = "xyes"; then
223 - if test "x$bf_lsbf" = "x1"; then
224 - AC_MSG_RESULT(LSBF${TEXT})
225 - AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
227 - AC_MSG_RESULT(MSBF${TEXT})
229 + AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
231 AC_HAVE_HEADERS( errno.h fcntl.h \
232 stdbool.h stdlib.h stdint.h stdio.h string.h \