ref: 163338036c534ea846d49fac6cdeeaa3923acae9
parent: 8b4468fddf4747419636999eb52bd5be97e0a21c
author: robs <robs>
date: Sun Jun 17 17:44:57 EDT 2007
Fix MP3 libs detection
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,8 +59,11 @@
optional(HAVE_LIBAMRWB amrwb/dec.h amrwb D_IF_init amr-wb)
optional(HAVE_LIBAO ao/ao.h ao ao_play ao)
optional(HAVE_LIBFLAC FLAC/all.h FLAC FLAC__stream_encoder_new flac)
-optional(HAVE_LIBMAD mad.h mad mad_stream_buffer mp3)
-optional(HAVE_LIBMP3LAME lame/lame.h mp3lame lame_init mp3)
+optional(HAVE_MAD_H mad.h mad mad_stream_buffer mp3)
+optional(HAVE_LAME_LAME_H lame/lame.h mp3lame lame_init mp3)
+if (NOT HAVE_LAME_LAME_H)
+ optional(HAVE_LAME_LAME_H lame.h mp3lame lame_init mp3)
+endif (NOT HAVE_LAME_LAME_H)
optional(HAVE_SAMPLERATE_H samplerate.h samplerate src_simple rabbit)
optional(HAVE_SNDFILE_H sndfile.h sndfile sf_open sndfile)
optional(HAVE_SNDFILE_1_0_12 sndfile.h sndfile sf_open_virtual "")
--- a/src/formats.h
+++ b/src/formats.h
@@ -59,7 +59,7 @@
#if defined HAVE_LIBFLAC
FORMAT(flac)
#endif
-#if defined(HAVE_LIBMAD) || defined(HAVE_LIBMP3LAME)
+#if defined(HAVE_MAD_H) || defined(HAVE_LAME_LAME_H)
FORMAT(mp3)
#endif
#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
--- a/src/soxconfig.h.cmake
+++ b/src/soxconfig.h.cmake
@@ -8,16 +8,16 @@
#cmakedefine HAVE_GETTIMEOFDAY 1
#cmakedefine HAVE_INTTYPES_H 1
#cmakedefine HAVE_IO_H 1
+#cmakedefine HAVE_LAME_LAME_H 1
#cmakedefine HAVE_LIBAMRNB 1
#cmakedefine HAVE_LIBAMRWB 1
#cmakedefine HAVE_LIBAO 1
#cmakedefine HAVE_LIBAVPLUGIN 1
#cmakedefine HAVE_LIBFLAC 1
-#cmakedefine HAVE_LIBMAD 1
-#cmakedefine HAVE_LIBMP3LAME 1
#cmakedefine HAVE_LIBVORBIS 1
#cmakedefine HAVE_LTDL_H 1
#cmakedefine HAVE_MACHINE_SOUNDCARD_H 1
+#cmakedefine HAVE_MAD_H 1
#cmakedefine HAVE_POPEN 1
#cmakedefine HAVE_SAMPLERATE_H 1
#cmakedefine HAVE_SNDFILE_1_0_12 1