diff --git a/configure.ac b/configure.ac index 2ac890a386..1085d7cb9c 100644 --- a/configure.ac +++ b/configure.ac @@ -1291,9 +1291,13 @@ PKG_CHECK_MODULES([SHOUT], [shout >= 2.2.2],[ AM_CONDITIONAL([HAVE_SHOUT],[true])],[ AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SHOUT],[false])]) -PKG_CHECK_MODULES([MP3LAME], [mp3lame],[ - AM_CONDITIONAL([HAVE_MP3LAME],[true])],[ - AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MP3LAME],[false])]) +mp3lame=false +AC_CHECK_LIB([mp3lame], [lame_init],[ + AC_CHECK_HEADER([lame/lame.h],[ + mp3lame=true + AC_SUBST([MP3LAME_LIBS], [-lmp3lame]) + AC_SUBST([MP3LAME_CFLAGS], [$CPPFLAGS])])]) +AM_CONDITIONAL([HAVE_MP3LAME],[$mp3lame]) PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[ AM_CONDITIONAL([HAVE_AVCODEC],[true])],[ diff --git a/src/mod/formats/mod_shout/Makefile.am b/src/mod/formats/mod_shout/Makefile.am index 362561d3b7..7fd8e01ab3 100644 --- a/src/mod/formats/mod_shout/Makefile.am +++ b/src/mod/formats/mod_shout/Makefile.am @@ -3,6 +3,7 @@ MODNAME=mod_shout if HAVE_SHOUT if HAVE_MPG123 +if HAVE_MP3LAME mod_LTLIBRARIES = mod_shout.la mod_shout_la_SOURCES = mod_shout.c @@ -11,10 +12,11 @@ mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) $(SHOUT_CFLAGS) $(MP3LAME_ mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_shout_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared $(SHOUT_LIBS) $(MP3LAME_LIBS) $(MPG123_LIBS) - -if !HAVE_MP3LAME -mod_shout_la_LDFLAGS += -lmp3lame -mod_shout_la_CFLAGS += -I/usr/include/lame +else +install: error +all: error +error: + $(error You must install libmp3lame-dev to build mod_shout) endif else diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c index 7e5cc2fef5..60275ff3e7 100644 --- a/src/mod/formats/mod_shout/mod_shout.c +++ b/src/mod/formats/mod_shout/mod_shout.c @@ -35,7 +35,7 @@ #include #include "mpg123.h" #include -#include +#include #include #define OUTSCALE 8192 * 2