Permalink
Browse files

fixed: don't use a hard-coded name for the mp3lame library

  • Loading branch information...
1 parent 99d7682 commit 6ad8770d9f6c062249fd60c659c6f3c81541d55f spiff committed May 2, 2012
Showing with 6 additions and 1,108 deletions.
  1. +5 −1 configure.in
  2. +1 −5 xbmc/DllPaths_generated.h.in
  3. +0 −1,102 xbmc/cdrip/lame/lame.h
View
@@ -694,6 +694,7 @@ AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
+AC_CHECK_HEADER([lame/lame.h],, AC_MSG_ERROR($missing_headers))
# we need to check for the header because if it exists we set the openssl
# and gcrypt MT callback hooks. This is mostly so that libcurl operates
@@ -808,12 +809,15 @@ XB_FIND_SONAME([OGG], [ogg])
XB_FIND_SONAME([CURL], [curl])
XB_FIND_SONAME([FLAC], [FLAC])
XB_FIND_SONAME([VORBIS], [vorbis])
-XB_FIND_SONAME([VORBISENC], [vorbisenc])
XB_FIND_SONAME([VORBISFILE], [vorbisfile])
XB_FIND_SONAME([MODPLUG], [modplug])
XB_FIND_SONAME([ASS], [ass])
XB_FIND_SONAME([MPEG2], [mpeg2])
+# Audio encoders
+XB_FIND_SONAME([LAMEENC], [mp3lame])
+XB_FIND_SONAME([VORBISENC], [vorbisenc])
+
# WebServer
if test "$use_webserver" = "yes"; then
AC_CHECK_LIB([microhttpd], [main],, AC_MSG_ERROR($missing_library))
@@ -83,11 +83,7 @@
#define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0-@ARCH@.so"
/* cdrip */
-#if defined(_LINUX) && !defined(__APPLE__)
-#define DLL_PATH_LAME_ENC "libmp3lame.so.0"
-#else
-#define DLL_PATH_LAME_ENC "special://xbmcbin/system/cdrip/lame_enc-@ARCH@.so"
-#endif
+#define DLL_PATH_LAME_ENC "@LAMEENC_SONAME@"
#define DLL_PATH_OGG "@OGG_SONAME@"
#define DLL_PATH_VORBIS_ENC "@VORBISENC_SONAME@"
#define DLL_PATH_VORBIS "@VORBIS_SONAME@"
Oops, something went wrong.

0 comments on commit 6ad8770

Please sign in to comment.