1 --- xine-lib-1-rc6a/configure.ac.orig 2004-09-16 22:28:33.762843408 -0400
2 +++ xine-lib-1-rc6a/configure.ac 2004-09-16 22:29:00.969707336 -0400
4 dnl ---------------------------------------------
6 AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
7 -AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
8 +AM_CONDITIONAL(HAVE_AA, [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
11 dnl ---------------------------------------------
14 dnl ---------------------------------------------
17 - AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
19 -AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
20 +AM_CONDITIONAL(HAVE_SDL, 0)
23 dnl ---------------------------------------------
26 dnl ---------------------------------------------
29 - [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
30 - AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
32 - AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
33 -AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
34 +AM_CONDITIONAL(HAVE_THEORA, 0)
37 dnl ---------------------------------------------
39 dnl ---------------------------------------------
41 -PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
43 -if test "x$no_speex" = "xyes" ; then
44 - AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
47 -if test "x$no_speex" = "xyes" ; then
48 - AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
50 - AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
52 - dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
53 - dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
54 - AC_CHECK_HEADER([speex/speex.h],
55 - AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
58 - AC_SUBST(SPEEX_CFLAGS)
59 - AC_SUBST(SPEEX_LIBS)
61 -AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
62 +AM_CONDITIONAL(HAVE_SPEEX, 0)
65 dnl ---------------------------------------------
67 dnl ---------------------------------------------
70 - AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
71 -AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
72 +AM_CONDITIONAL(HAVE_FLAC, 0)
75 dnl ---------------------------------------------
77 dnl ---------------------------------------------
79 -AC_CHECK_LIB(mng, mng_initialize,
80 - [ AC_CHECK_HEADER(libmng.h,
83 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
84 - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
85 -AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
87 +AM_CONDITIONAL(HAVE_LIBMNG, 0)
93 dnl ---------------------------------------------
96 +AM_CONDITIONAL(HAVE_FT2, 0)
99 dnl ---------------------------------------------
100 @@ -995,37 +960,21 @@
102 dnl ---------------------------------------------
105 - AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
106 - AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
107 -AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
108 +AM_CONDITIONAL(HAVE_ESD, 0)
111 dnl ---------------------------------------------
113 dnl ---------------------------------------------
116 - AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
117 - AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
118 -AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
119 +AM_CONDITIONAL(HAVE_ARTS, 0)
122 dnl ---------------------------------------------
123 dnl gnome-vfs support
124 dnl ---------------------------------------------
126 -PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
129 -AC_SUBST(GNOME_VFS_CFLAGS)
130 -AC_SUBST(GNOME_VFS_LIBS)
131 -if test x"$no_gnome_vfs" != "xyes"; then
132 -AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
134 -AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
136 -AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
137 +AM_CONDITIONAL(HAVE_GNOME_VFS, 0)
140 dnl ---------------------------------------------
141 @@ -1188,35 +1137,7 @@
143 AC_MSG_RESULT($ISOC99_PRAGMA)
146 - AC_MSG_CHECKING(bitfield ordering in structs)
150 - struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
151 -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
152 - __attribute__((packed))
155 - if (sizeof (bf) != 1) return 1;
156 - return *((unsigned char*) &bf) != 0x4b; }
157 -], bf_lsbf=1, AC_TRY_RUN([
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) != 0xa5; }
167 -], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
168 - if test "x$bf_lsbf" = "x1"; then
169 - AC_MSG_RESULT(LSBF)
170 - AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
172 - AC_MSG_RESULT(MSBF)
174 + AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
176 AC_HAVE_HEADERS( errno.h fcntl.h \
177 stdbool.h stdlib.h stdint.h stdio.h string.h \