1 --- a/src/format_flac.c
2 +++ b/src/format_flac.c
8 +#include <tremor/ogg.h>
11 typedef struct source_tag source_t;
12 --- a/src/format_midi.c
13 +++ b/src/format_midi.c
19 +#include <tremor/ogg.h>
22 typedef struct source_tag source_t;
23 --- a/src/format_ogg.c
24 +++ b/src/format_ogg.c
30 +#include <tremor/ogg.h>
34 --- a/src/format_ogg.h
35 +++ b/src/format_ogg.h
37 #ifndef __FORMAT_OGG_H__
38 #define __FORMAT_OGG_H__
41 +#include <tremor/ogg.h>
45 --- a/src/format_speex.c
46 +++ b/src/format_speex.c
52 +#include <tremor/ogg.h>
53 #include <speex/speex_header.h>
55 typedef struct source_tag source_t;
56 --- a/src/format_theora.c
57 +++ b/src/format_theora.c
63 +#include <tremor/ogg.h>
64 #include <theora/theora.h>
66 typedef struct source_tag source_t;
67 --- a/src/format_vorbis.c
68 +++ b/src/format_vorbis.c
74 -#include <vorbis/codec.h>
75 +#include <tremor/ogg.h>
76 +#include <tremor/ivorbiscodec.h>
85 #include <sys/types.h>
87 +#include <tremor/ogg.h>
91 --- a/src/format_kate.c
92 +++ b/src/format_kate.c
98 +#include <tremor/ogg.h>
100 #include <kate/oggkate.h>
104 @@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref
108 -VORBIS_LIBS="-lvorbis"
109 -VORBISFILE_LIBS="-lvorbisfile"
110 -VORBISENC_LIBS="-lvorbisenc"
111 +VORBIS_LIBS="-lvorbisidec"
112 +VORBISFILE_LIBS="-lvorbisidec"
113 +VORBISENC_LIBS="-lvorbisidec"
116 xt_save_LDFLAGS="$LDFLAGS"
117 @@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li
121 -if test "x$xt_lib_vorbis" = "xok"; then
123 -# Now check if the installed Vorbis is sufficiently new.
125 -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
126 -#include <vorbis/codec.h>
127 -#include <vorbis/vorbisenc.h>
129 -struct ovectl_ratemanage_arg a;
130 -])],,[xt_lib_vorbis="old version found"])
131 -AC_MSG_RESULT([$xt_lib_vorbis])
133 CPPFLAGS="$xt_save_CPPFLAGS"
135 LDFLAGS="$xt_save_LDFLAGS"
138 @@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include]
140 AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
143 +OGG_LIBS="-lvorbisidec"
146 # check if the installed Ogg is sufficiently new.
147 @@ -42,7 +42,7 @@ LIBS="$LIBS $OGG_LIBS"
148 LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
149 AC_TRY_LINK_FUNC(ogg_sync_init,
150 [ xt_cv_lib_ogg=ok ],
151 - [ AC_TRY_LINK([#include <ogg/ogg.h>],,
152 + [ AC_TRY_LINK([#include <tremor/ogg.h>],,
153 [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
154 [ xt_cv_lib_ogg="not found" ])