shithub: sox

Info  •  Files  •  Log  •  Branches

oggvorbis: use consistent names for build variables

Replace OGG_VORBIS with OGGVORBIS for consistency.

--- a/configure.ac

+++ b/configure.ac

@@ -426,11 +426,11 @@

 # Check for Ogg Vorbis

-AC_OPTIONAL_FORMAT(oggvorbis, OGG_VORBIS, [AC_CHECK_HEADER(vorbis/codec.h,

-  [AC_CHECK_LIB(ogg, ogg_packet_clear, OGG_VORBIS_LIBS="$OGG_VORBIS_LIBS -logg", using_oggvorbis=no)

-  AC_CHECK_LIB(vorbis, vorbis_analysis_headerout, OGG_VORBIS_LIBS="-lvorbis $OGG_VORBIS_LIBS", using_oggvorbis=no, $OGG_VORBIS_LIBS)

-  AC_CHECK_LIB(vorbisfile, ov_clear, OGG_VORBIS_LIBS="-lvorbisfile $OGG_VORBIS_LIBS", using_oggvorbis=no, $OGG_VORBIS_LIBS)

-  AC_CHECK_LIB(vorbisenc, vorbis_encode_init_vbr, OGG_VORBIS_LIBS="-lvorbisenc $OGG_VORBIS_LIBS", using_oggvorbis=no, $OGG_VORBIS_LIBS)],

+AC_OPTIONAL_FORMAT(oggvorbis, OGGVORBIS, [AC_CHECK_HEADER(vorbis/codec.h,

+  [AC_CHECK_LIB(ogg, ogg_packet_clear, OGGVORBIS_LIBS="$OGGVORBIS_LIBS -logg", using_oggvorbis=no)

+  AC_CHECK_LIB(vorbis, vorbis_analysis_headerout, OGGVORBIS_LIBS="-lvorbis $OGGVORBIS_LIBS", using_oggvorbis=no, $OGGVORBIS_LIBS)

+  AC_CHECK_LIB(vorbisfile, ov_clear, OGGVORBIS_LIBS="-lvorbisfile $OGGVORBIS_LIBS", using_oggvorbis=no, $OGGVORBIS_LIBS)

+  AC_CHECK_LIB(vorbisenc, vorbis_encode_init_vbr, OGGVORBIS_LIBS="-lvorbisenc $OGGVORBIS_LIBS", using_oggvorbis=no, $OGGVORBIS_LIBS)],

   using_oggvorbis=no)])

 # Check for Opus

--- a/src/formats.h

+++ b/src/formats.h

@@ -122,7 +122,7 @@

 #if defined HAVE_SUNAUDIO && (defined STATIC_SUNAUDIO || !defined HAVE_LIBLTDL)

   FORMAT(sunau)

 #endif

-#if defined HAVE_OGG_VORBIS && (defined STATIC_OGG_VORBIS || !defined HAVE_LIBLTDL)

+#if defined HAVE_OGGVORBIS && (defined STATIC_OGGVORBIS || !defined HAVE_LIBLTDL)

   FORMAT(vorbis)

 #endif

 #if defined HAVE_WAVPACK && (defined STATIC_WAVPACK || !defined HAVE_LIBLTDL)

--- a/src/optional-fmts.am

+++ b/src/optional-fmts.am

@@ -218,17 +218,17 @@

 endif

 endif

-if HAVE_OGG_VORBIS

-if STATIC_OGG_VORBIS

+if HAVE_OGGVORBIS

+if STATIC_OGGVORBIS

   libsox_la_SOURCES += vorbis.c

 if STATIC_LIBSOX_ONLY

-  sox_LDADD += @OGG_VORBIS_LIBS@

+  sox_LDADD += @OGGVORBIS_LIBS@

 else

-  libsox_la_LIBADD += @OGG_VORBIS_LIBS@

+  libsox_la_LIBADD += @OGGVORBIS_LIBS@

 endif

 else

   libsox_fmt_vorbis_la_SOURCES = vorbis.c

-  libsox_fmt_vorbis_la_LIBADD = libsox.la @OGG_VORBIS_LIBS@

+  libsox_fmt_vorbis_la_LIBADD = libsox.la @OGGVORBIS_LIBS@

   pkglib_LTLIBRARIES += libsox_fmt_vorbis.la

 endif

 endif