1 Index: xine-lib-1.0/configure.ac
2 ===================================================================
3 --- xine-lib-1.0.orig/configure.ac 2004-12-25 18:40:24.000000000 +0100
4 +++ xine-lib-1.0/configure.ac 2005-02-16 22:57:07.926566529 +0100
8 AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
9 +AM_CONDITIONAL(HAVE_XV, test x$ac_have_xvfoo = "xyes")
14 dnl ---------------------------------------------
16 AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
17 -AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
18 +AM_CONDITIONAL(HAVE_AA, [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
21 dnl ---------------------------------------------
24 dnl ---------------------------------------------
27 - AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
29 -AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
30 +AM_CONDITIONAL(HAVE_SDL, 0)
33 dnl ---------------------------------------------
36 dnl ---------------------------------------------
39 - [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
40 - AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
42 - AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
43 -AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
44 +AM_CONDITIONAL(HAVE_THEORA, 0)
47 dnl ---------------------------------------------
49 dnl ---------------------------------------------
51 -PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
53 -if test "x$no_speex" = "xyes" ; then
54 - AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
57 -if test "x$no_speex" = "xyes" ; then
58 - AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
60 - AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
62 - dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
63 - dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
64 - AC_CHECK_HEADER([speex/speex.h],
65 - AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
68 - AC_SUBST(SPEEX_CFLAGS)
69 - AC_SUBST(SPEEX_LIBS)
71 -AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
72 +AM_CONDITIONAL(HAVE_SPEEX, 0)
75 dnl ---------------------------------------------
77 dnl ---------------------------------------------
80 - AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
81 -AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
82 +AM_CONDITIONAL(HAVE_FLAC, 0)
85 dnl ---------------------------------------------
87 dnl ---------------------------------------------
89 -AC_CHECK_LIB(mng, mng_initialize,
90 - [ AC_CHECK_HEADER(libmng.h,
93 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
94 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
95 -AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
97 +AM_CONDITIONAL(HAVE_LIBMNG, 0)
101 @@ -1066,7 +1032,7 @@
103 dnl ---------------------------------------------
106 +AM_CONDITIONAL(HAVE_FT2, 0)
109 dnl ---------------------------------------------
110 @@ -1109,37 +1075,21 @@
112 dnl ---------------------------------------------
115 - AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
116 - AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
117 -AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
118 +AM_CONDITIONAL(HAVE_ESD, 0)
121 dnl ---------------------------------------------
123 dnl ---------------------------------------------
126 - AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
127 - AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
128 -AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
129 +AM_CONDITIONAL(HAVE_ARTS, 0)
132 dnl ---------------------------------------------
133 dnl gnome-vfs support
134 dnl ---------------------------------------------
136 -PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
139 -AC_SUBST(GNOME_VFS_CFLAGS)
140 -AC_SUBST(GNOME_VFS_LIBS)
141 -if test x"$no_gnome_vfs" != "xyes"; then
142 -AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
144 -AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
146 -AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
147 +AM_CONDITIONAL(HAVE_GNOME_VFS, 0)
150 dnl ---------------------------------------------
151 @@ -1316,35 +1266,7 @@
153 AC_MSG_RESULT($ISOC99_PRAGMA)
156 - AC_MSG_CHECKING(bitfield ordering in structs)
160 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
161 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
162 - __attribute__((packed))
165 - if (sizeof (bf) != 1) return 1;
166 - return *((unsigned char*) &bf) != 0x4b; }
167 -], bf_lsbf=1, AC_TRY_RUN([
170 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
171 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
172 - __attribute__((packed))
175 - if (sizeof (bf) != 1) return 1;
176 - return *((unsigned char*) &bf) != 0xa5; }
177 -], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
178 - if test "x$bf_lsbf" = "x1"; then
179 - AC_MSG_RESULT(LSBF)
180 - AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
182 - AC_MSG_RESULT(MSBF)
184 + AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
186 AC_HAVE_HEADERS( errno.h fcntl.h \
187 stdbool.h stdlib.h stdint.h stdio.h string.h \