shithub: sox

Download patch

ref: 20918fd5b7ec8b216d9ece0d0a17b3148e5801f6
parent: d6f8ca6428e12e88642b5634fabbe7173a069ffa
author: cbagwell <cbagwell>
date: Sat Feb 12 11:24:33 EST 2011

Update configure to make use of new no-lame-header needed.

--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,6 @@
 
 File formats:
 
-  o Fix regression where MP3 handler required libmad headers to be installed.
-    (Samuli Suominen) 
   o Add seek support to mp3 handler for speed improvements.  (Pavel Karneliuk)
   o Fix bug were WavPack header was not updated correctly when closing
     file.  Fixed libsox memory leak when closing WavPack files.
@@ -24,6 +22,7 @@
     (David Bryant)
   o Fix ffmpeg playback bug caused by alignment requirements on some platforms.
     Closes bug #3017690.  (Reuben Thomas).
+  o Fix memory leak in ffmpeg. (Doug Cook)
 
 Audio device drivers:
 
@@ -32,6 +31,10 @@
   o Add support for 32-bit samples to OSS driver. (Eric Lammerts)
   o Add support for 24 and 32-bit samples to waveaudio (Win32) driver.
     (Doug Cook)
+  o Fix regression where MP3 handler required libmad headers to be installed.
+    (Samuli Suominen) 
+  o Allow dynamic loading of lame to be enabled even if lame header files
+    are not installed.  (Doug Cook)
 
 Effects:
 
--- a/configure.ac
+++ b/configure.ac
@@ -344,8 +344,6 @@
 using_lame=no
 if test "$with_lame" != "no"; then
     using_lame=yes
-    AC_CHECK_HEADERS(lame/lame.h,,
-        [AC_CHECK_HEADERS(lame.h,, using_lame=no)])
     AC_MSG_CHECKING([whether to dlopen lame])
     AC_ARG_ENABLE(dl_lame,
       AC_HELP_STRING([--enable-dl-lame], [Dlopen lame instead of linking in.]),
@@ -355,6 +353,8 @@
       AC_DEFINE(DL_LAME, 1, [Define to dlopen() lame.])
     else
       enable_dl_lame="no"
+      AC_CHECK_HEADERS(lame/lame.h,,
+        [AC_CHECK_HEADERS(lame.h,, using_lame=no)])
       AC_CHECK_LIB(mp3lame, lame_init, MP3_LIBS="$MP3_LIBS -lmp3lame",using_lame=no)
       AC_CHECK_LIB(mp3lame, lame_get_lametag_frame)
       if test "$ac_cv_lib_mp3lame_lame_get_lametag_frame" = yes; then