FS-8779: [mod_shout] properly detect lame/lame.h

* Add correct mp3lame configure check since it does not use pkg-config
* Update mod_shout Makefile to log failure message if mp3lame not available
* Rewrite #include for lame.h to lame/lame.h in mod_shout.c
This commit is contained in:
Corey Smith
2016-02-03 20:45:39 -05:00
parent 6914808402
commit 3cb04ced21
3 changed files with 14 additions and 8 deletions
+6 -4
View File
@@ -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
+1 -1
View File
@@ -35,7 +35,7 @@
#include <switch.h>
#include "mpg123.h"
#include <shout/shout.h>
#include <lame.h>
#include <lame/lame.h>
#include <switch_curl.h>
#define OUTSCALE 8192 * 2