shithub: sox

Info  •  Files  •  Log  •  Branches

Fix vorbis for configuration script changes

--- a/src/handlers.c

+++ b/src/handlers.c

@@ -65,7 +65,7 @@

   st_ul_format_fn,

   st_uw_format_fn,

   st_voc_format_fn,

-#ifdef HAVE_LIBVORBIS

+#if defined HAVE_LIBVORBISENC && defined HAVE_LIBVORBISFILE

   st_vorbis_format_fn,

 #endif

   st_vox_format_fn,

--- a/src/st_i.h

+++ b/src/st_i.h

@@ -221,7 +221,7 @@

 extern const st_format_t *st_svx_format_fn(void);

 extern const st_format_t *st_txw_format_fn(void);

 extern const st_format_t *st_voc_format_fn(void);

-#ifdef HAVE_LIBVORBIS

+#if defined HAVE_LIBVORBISENC && defined HAVE_LIBVORBISFILE

 extern const st_format_t *st_vorbis_format_fn(void);

 #endif

 extern const st_format_t *st_vox_format_fn(void);

--- a/src/vorbis.c

+++ b/src/vorbis.c

@@ -21,7 +21,7 @@

  */

 #include "st_i.h"

-#ifdef HAVE_LIBVORBIS

+#if defined HAVE_LIBVORBISENC && defined HAVE_LIBVORBISFILE

 #include <stdio.h>

 #include <math.h>

 #include <string.h>

@@ -489,4 +489,4 @@

 {

     return &st_vorbis_format;

 }

-#endif /* HAVE_LIBVORBIS */

+#endif