diff --git a/addons/Makefile b/addons/Makefile
index 06360dbfa54..babc589be1e 100644
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -31,6 +31,7 @@ H323CFLAGS:=-Iooh323c/src -Iooh323c/src/h323
 ALL_C_MODS:=chan_mobile \
             chan_ooh323 \
             format_mp3 \
+            format_lame \
             res_config_mysql
 
 all: check_mp3 _all
diff --git a/addons/format_lame.c b/addons/format_lame.c
new file mode 100644
index 00000000000..af2e420a782
--- /dev/null
+++ b/addons/format_lame.c
@@ -0,0 +1,553 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2018, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*!
+ * \file
+ * \brief MP3 Format including encoder and decoder
+ * \ingroup formats
+ */
+
+/*** MODULEINFO
+	<depend>lame</depend>
+	<conflict>format_mp3</conflict>
+	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include <lame/lame.h>
+
+#include "asterisk/module.h"
+#include "asterisk/mod_format.h"
+#include "asterisk/logger.h"
+#include "asterisk/format_cache.h"
+
+#define SLIN_BUFLEN 320
+#define DECORDER_OUTLEN 32768
+#define BITS 2
+
+struct mp3lame_private {
+	lame_global_flags * lgfp;
+	hip_global_flags * hgfp;
+
+	int sample_rate;
+
+	/* decoder buffer */
+	short int doutput[DECORDER_OUTLEN *  1024];
+	long doffset;
+	int dsamples;
+
+	/* decoder positions */
+	int total_bytes_decoded, total_bytes_compressed;
+
+	/* counters */
+	unsigned int decoder_counter, encoder_counter;
+};
+
+static void mp3lame_error(const char *format, va_list ap)
+{
+	ast_log_ap(AST_LOG_WARNING, format, ap);
+}
+
+static void mp3lame_debug(const char *format, va_list ap)
+{
+	ast_log_ap(AST_LOG_DEBUG, format, ap);
+}
+
+static void mp3lame_msg(const char *format, va_list ap)
+{
+	ast_log_ap(AST_LOG_NOTICE, format, ap);
+}
+
+static int mp3lame_encoder_init(struct mp3lame_private *p)
+{
+	p->lgfp = lame_init();
+
+	/* Set logging callbacks */
+	lame_set_errorf(p->lgfp, mp3lame_error);
+	lame_set_debugf(p->lgfp, mp3lame_debug);
+	lame_set_msgf(p->lgfp, mp3lame_msg);
+
+	/* Mono */
+	lame_set_num_channels(p->lgfp, 1);
+	/* Sample rate */
+	lame_set_in_samplerate(p->lgfp, p->sample_rate);
+	/* Bit rate, e.g.:
+	* 16kbps for 8000Hz
+	* 32kbps for 16000Hz
+	* 64kbps for 32000Hz
+    * 96kbsp for 48000Hz
+	*/
+	lame_set_brate(p->lgfp, p->sample_rate / 500);
+	/* Mono */
+	lame_set_mode(p->lgfp, 3);
+	/* Medium quality */
+	lame_set_quality(p->lgfp, 5);
+
+	return lame_init_params(p->lgfp);
+}
+
+static int mp3lame_encoder_deinit(struct ast_filestream *fs)
+{
+	int res, wres;
+	struct mp3lame_private *p = fs->_private;
+	unsigned char last_encoder_buffer[p->sample_rate];
+
+	res = lame_encode_flush(p->lgfp, last_encoder_buffer, sizeof(last_encoder_buffer));
+	if (res < 0) {
+		ast_log(LOG_WARNING, "LAME encode last returned error %d\n", res);
+		lame_close(p->lgfp);
+		return -1;
+	} else if (res > 0) {
+		wres = fwrite(last_encoder_buffer, 1, res, fs->f);
+		if (wres != res) {
+			ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", wres, res, strerror(errno));
+			lame_close(p->lgfp);
+			return -1;
+		} else {
+			ast_debug(3, "LAME encode flushed %d bytes", wres);
+		}
+	}
+
+	return lame_close(p->lgfp);
+}
+
+static int mp3lame_decoder_init(struct ast_filestream *fs)
+{
+	int size;
+	struct mp3lame_private *p = fs->_private;
+
+	p->hgfp = hip_decode_init();
+
+	/* Set logging callbacks */
+	hip_set_errorf(p->hgfp, mp3lame_error);
+	hip_set_debugf(p->hgfp, mp3lame_debug);
+	hip_set_msgf(p->hgfp, mp3lame_error);
+
+	/* Get filesize in bytes */
+	fseek(fs->f, 0, SEEK_END);
+	size = ftell(fs->f);
+	fseek(fs->f, 0, SEEK_SET);
+
+	return size;
+}
+
+static int mp3lame_decoder_deinit(struct mp3lame_private *p)
+{
+	return hip_decode_exit(p->hgfp);
+}
+
+static int mp3lame_hip_decode(hip_global_flags * handle, int input_size, unsigned char * input, short int * output, int sample_rate)
+{
+	int samples;
+	mp3data_struct headers;
+
+	samples = hip_decode_headers(handle, input, input_size, output, NULL, &headers);
+
+	if (headers.header_parsed == 1) {
+		ast_debug(3, "LAME decoder found MP3 headers:\nchannels=%d, samplerate=%d, bitrate=%d, framesize=%d, mode=[%d:%d]",
+			headers.stereo,
+			headers.samplerate,
+			headers.bitrate,
+			headers.framesize,
+			headers.mode,
+			headers.mode_ext
+		);
+		if (headers.stereo < 1) {
+			ast_debug(3, "LAME decoder no audio channels");
+			return -1;
+		} else if (headers.stereo > 1) {
+			ast_log(LOG_ERROR, "LAME decoder invalid number of channels: %d, only mono is acceptable", headers.stereo);
+			return -2;
+		}
+		if (headers.samplerate != sample_rate) {
+			ast_log(LOG_ERROR, "LAME decoder invalid sampling rate: %d, expected %d", headers.samplerate, sample_rate);
+			return -3;
+		}
+	}
+
+	return samples;
+}
+
+static int mp3lame_open(struct ast_filestream *s)
+{
+	struct mp3lame_private *p = s->_private;
+
+	p->encoder_counter = 0;
+	p->decoder_counter = 0;
+
+	return 0;
+}
+
+static void mp3lame_close(struct ast_filestream *s)
+{
+	struct mp3lame_private *p = s->_private;
+
+	if (p->encoder_counter != 0) {
+		mp3lame_encoder_deinit(s);
+	}
+
+	return;
+}
+
+static struct ast_frame *mp3lame_read(struct ast_filestream *s, int *whennext, int frame_size, int sample_rate)
+{
+	int rres, remaining_samples;
+	struct mp3lame_private *p = s->_private;
+
+	if (p->encoder_counter != 0) {
+		ast_log(LOG_ERROR, "This filestream is already in encoder mode");
+		return NULL;
+	}
+
+	if (p->decoder_counter == 0) {
+		p->total_bytes_compressed = mp3lame_decoder_init(s);
+
+		unsigned char dinput[p->total_bytes_compressed];
+
+		rres = fread(dinput, 1, p->total_bytes_compressed, s->f);
+		if(rres != p->total_bytes_compressed){
+			ast_log(LOG_ERROR, "Short read (%d/%d)", rres, p->total_bytes_compressed);
+			return NULL;
+		}
+
+		ast_debug(3, "LAME decoder input: %d bytes", rres);
+		p->dsamples = mp3lame_hip_decode(p->hgfp, rres, dinput, p->doutput, sample_rate);
+		while (p->dsamples == 0) {
+			p->dsamples = mp3lame_hip_decode(p->hgfp, 0, NULL, p->doutput, sample_rate);
+		}
+		ast_debug(3, "LAME decoder got %d output samples", p->dsamples);
+		p->total_bytes_decoded = p->dsamples * BITS;
+
+		mp3lame_decoder_deinit(p);
+		p->doffset = 0;
+	}
+	p->decoder_counter++;
+
+	AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size);
+
+	remaining_samples = p->dsamples - (frame_size / BITS);
+	if (remaining_samples >= 0) {
+		/* Output a full ast_frame */
+		s->fr.datalen = frame_size;
+		s->fr.samples = frame_size / BITS;
+		*whennext = frame_size / BITS;
+		memcpy(s->fr.data.ptr, (char *)p->doutput + p->doffset, frame_size);
+		p->doffset += frame_size;
+		p->dsamples = remaining_samples;
+		return &s->fr;
+	} else {
+		/* Output a partial ast_frame */
+		if (p->dsamples > 0) {
+			s->fr.datalen = p->dsamples * BITS;
+			s->fr.samples = p->dsamples;
+			memcpy(s->fr.data.ptr, (char *)p->doutput + p->doffset, p->dsamples * BITS);
+			*whennext = 0;
+			p->dsamples = 0;
+			return &s->fr;
+		} else {
+			p->dsamples = 0;
+			return NULL;
+		}
+	}
+}
+
+static int mp3lame_write(struct ast_filestream *fs, struct ast_frame *f, int sample_rate)
+{
+	int res, wres;
+	unsigned char encoder_buffer[sample_rate];
+	struct mp3lame_private *p = fs->_private;
+
+	if (p->decoder_counter != 0) {
+		ast_log(LOG_ERROR, "This filestream is already in decoder mode");
+		return -1;
+	}
+
+	if (p->encoder_counter == 0) {
+		p->sample_rate = sample_rate;
+		mp3lame_encoder_init(p);
+	}
+	p->encoder_counter++;
+
+	/*
+	* Reinitialize lame encoder before every five minutes of audio data.
+	* Unfortunatly lame stops encoding after this time.
+	* Probably an internal timer in lame.
+	* 14999 calculated as 300 seconds multipled by 50 frames (1000ms as 1 second / 20ms packetization time) - 1 to be sure
+	*/
+	if (p->encoder_counter % 14999 == 0) {
+		ast_debug(3, "Reinitializing LAME encoder after 5 mins");
+		mp3lame_encoder_deinit(fs);
+		mp3lame_encoder_init(p);
+	}
+
+	res = lame_encode_buffer(p->lgfp, f->data.ptr, f->data.ptr, f->samples, encoder_buffer, sizeof(encoder_buffer));
+	if (res < 0) {
+		ast_log(LOG_WARNING, "LAME encoder returned error %d\n", res);
+		return -1;
+	} else if (res > 0) {
+		wres = fwrite(encoder_buffer, 1, res, fs->f);
+		if (wres != res) {
+			ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", wres, res, strerror(errno));
+			return -1;
+		} else {
+			ast_debug(3, "LAME encoder wrote %d bytes", wres);
+		}
+	}
+
+	return 0;
+}
+
+static off_t mp3lame_tell(struct ast_filestream *s)
+{
+	struct mp3lame_private *p = s->_private;
+
+	if (p->decoder_counter != 0) {
+		return p->doffset;
+	} else {
+		return ftello(s->f) / BITS;
+	}
+}
+
+static int mp3lame_seek(struct ast_filestream *s, off_t sample_offset, int whence)
+{
+	struct mp3lame_private *p = s->_private;
+
+	off_t offset = 0, min = 0, max, current;
+
+	sample_offset <<= 1;
+
+	if (p->decoder_counter != 0) {
+		max = p->total_bytes_decoded;
+		current = p->doffset;
+	} else {
+		if ((current = ftello(s->f)) < 0) {
+			ast_log(AST_LOG_WARNING, "Unable to determine current position in mp3 filestream %p: %s\n", s, strerror(errno));
+			return -1;
+		}
+
+		if (fseeko(s->f, 0, SEEK_END) < 0) {
+			ast_log(AST_LOG_WARNING, "Unable to seek to end of mp3 filestream %p: %s\n", s, strerror(errno));
+			return -1;
+		}
+
+		if ((max = ftello(s->f)) < 0) {
+			ast_log(AST_LOG_WARNING, "Unable to determine max position in mp3 filestream %p: %s\n", s, strerror(errno));
+			return -1;
+		}
+	}
+
+	if (whence == SEEK_SET)
+		offset = sample_offset;
+	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
+		offset = sample_offset + current;
+	else if (whence == SEEK_END)
+		offset = max - sample_offset;
+	if (whence != SEEK_FORCECUR) {
+		offset = (offset > max)?max:offset;
+	}
+	/* always protect against seeking past begining. */
+	offset = (offset < min)?min:offset;
+
+	if (p->decoder_counter != 0) {
+		p->doffset = offset;
+		p->dsamples = (p->total_bytes_decoded - offset) / BITS;
+
+		return 0;
+	}
+
+	return fseeko(s->f, offset, SEEK_SET);
+}
+
+static int mp3lame_trunc(struct ast_filestream *s)
+{
+	int fd;
+	struct mp3lame_private *p = s->_private;
+	off_t current = mp3lame_tell(s);
+
+	if (p->decoder_counter != 0) {
+
+		p->dsamples = 0;
+		p->total_bytes_decoded = p->doffset;
+
+		return 0;
+	} else {
+
+		if ((fd = fileno(s->f)) < 0) {
+			ast_log(AST_LOG_WARNING, "Unable to determine file descriptor for mp3 filestream %p: %s\n", s, strerror(errno));
+			return -1;
+		}
+
+		if ((current = ftello(s->f)) < 0) {
+			ast_log(AST_LOG_WARNING, "Unable to determine current position in mp3 filestream %p: %s\n", s, strerror(errno));
+			return -1;
+		}
+
+		return ftruncate(fd, current);
+	}
+}
+
+static char *mp3lame_getcomment(struct ast_filestream *s)
+{
+	char * comment = "Asterisk MP3 lame\0";
+	return comment;
+}
+
+/* Sampling rate: 8khz */
+static int mp3lame_write8(struct ast_filestream *fs, struct ast_frame *f)
+{
+	return mp3lame_write(fs, f, 8000);
+}
+static struct ast_frame *mp3lame_read8(struct ast_filestream *s, int *whennext)
+{
+	return mp3lame_read(s, whennext, SLIN_BUFLEN, 8000);
+}
+static struct ast_format_def lame8_f = {
+	.name = "lame8",
+	.exts = "8mp3|mp3",
+	.mime_types = "audio/mp3",
+	.open = mp3lame_open,
+	.write = mp3lame_write8,
+	.seek =	mp3lame_seek,
+	.trunc = mp3lame_trunc,
+	.tell =	mp3lame_tell,
+	.read =	mp3lame_read8,
+	.close = mp3lame_close,
+	.getcomment = mp3lame_getcomment,
+	.buf_size = SLIN_BUFLEN + AST_FRIENDLY_OFFSET,
+	.desc_size = sizeof(struct mp3lame_private),
+};
+
+/* Sampling rate: 16khz */
+static int mp3lame_write16(struct ast_filestream *fs, struct ast_frame *f)
+{
+	return mp3lame_write(fs, f, 16000);
+}
+static struct ast_frame *mp3lame_read16(struct ast_filestream *s, int *whennext)
+{
+	return mp3lame_read(s, whennext, (SLIN_BUFLEN * 2), 16000);
+}
+static struct ast_format_def lame16_f = {
+	.name = "lame16",
+	.exts = "16mp3",
+	.mime_types = "audio/mp3",
+	.open = mp3lame_open,
+	.write = mp3lame_write16,
+	.seek =	mp3lame_seek,
+	.trunc = mp3lame_trunc,
+	.tell =	mp3lame_tell,
+	.read =	mp3lame_read16,
+	.close = mp3lame_close,
+	.getcomment = mp3lame_getcomment,
+	.buf_size = (SLIN_BUFLEN * 2) + AST_FRIENDLY_OFFSET,
+	.desc_size = sizeof(struct mp3lame_private),
+};
+
+/* Sampling rate: 32khz */
+static int mp3lame_write32(struct ast_filestream *fs, struct ast_frame *f)
+{
+	return mp3lame_write(fs, f, 32000);
+}
+static struct ast_frame *mp3lame_read32(struct ast_filestream *s, int *whennext)
+{
+	return mp3lame_read(s, whennext, (SLIN_BUFLEN * 4), 32000);
+}
+static struct ast_format_def lame32_f = {
+	.name = "lame32",
+	.exts = "32mp3",
+	.mime_types = "audio/mp3",
+	.open = mp3lame_open,
+	.write = mp3lame_write32,
+	.seek =	mp3lame_seek,
+	.trunc = mp3lame_trunc,
+	.tell =	mp3lame_tell,
+	.read =	mp3lame_read32,
+	.close = mp3lame_close,
+	.getcomment = mp3lame_getcomment,
+	.buf_size = (SLIN_BUFLEN * 4) + AST_FRIENDLY_OFFSET,
+	.desc_size = sizeof(struct mp3lame_private),
+};
+
+/* Sampling rate: 48khz */
+static int mp3lame_write48(struct ast_filestream *fs, struct ast_frame *f)
+{
+	return mp3lame_write(fs, f, 48000);
+}
+static struct ast_frame *mp3lame_read48(struct ast_filestream *s, int *whennext)
+{
+	return mp3lame_read(s, whennext, (SLIN_BUFLEN * 6), 48000);
+}
+static struct ast_format_def lame48_f = {
+	.name = "lame48",
+	.exts = "48mp3",
+	.mime_types = "audio/mp3",
+	.open = mp3lame_open,
+	.write = mp3lame_write48,
+	.seek =	mp3lame_seek,
+	.trunc = mp3lame_trunc,
+	.tell =	mp3lame_tell,
+	.read =	mp3lame_read48,
+	.close = mp3lame_close,
+	.getcomment = mp3lame_getcomment,
+	.buf_size = (SLIN_BUFLEN * 6) + AST_FRIENDLY_OFFSET,
+	.desc_size = sizeof(struct mp3lame_private),
+};
+
+static struct ast_format_def *lame_list[] = {
+	&lame8_f,
+	&lame16_f,
+	&lame32_f,
+	&lame48_f,
+};
+
+static int unload_module(void)
+{
+	int res = 0;
+	int i = 0;
+
+	for (i = 0; i < ARRAY_LEN(lame_list); i++) {
+		if (ast_format_def_unregister(lame_list[i]->name)) {
+			res = -1;
+		}
+	}
+	return res;
+}
+
+static int load_module(void)
+{
+	int i;
+
+	ast_log(LOG_NOTICE, "LAME version: %s\n", get_lame_version());
+
+	lame8_f.format = ast_format_slin;
+	lame16_f.format = ast_format_slin16;
+	lame32_f.format = ast_format_slin32;
+	lame48_f.format = ast_format_slin48;
+
+	for (i = 0; i < ARRAY_LEN(lame_list); i++) {
+		if (ast_format_def_register(lame_list[i])) {
+			unload_module();
+			return AST_MODULE_LOAD_DECLINE;
+		}
+	}
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "MP3 format using LAME");
diff --git a/addons/format_mp3.c b/addons/format_mp3.c
index f4b0a2ac0b1..17d5a26f8bf 100644
--- a/addons/format_mp3.c
+++ b/addons/format_mp3.c
@@ -28,6 +28,7 @@
  */
 
 /*** MODULEINFO
+	<conflict>format_lame</conflict>
 	<defaultenabled>no</defaultenabled>
 	<support_level>extended</support_level>
  ***/
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 6594a922eba..e6a99bad625 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -26,6 +26,7 @@ JACK=@PBX_JACK@
 JANSSON=@PBX_JANSSON@
 URIPARSER=@PBX_URIPARSER@
 KQUEUE=@PBX_KQUEUE@
+LAME=@PBX_LAME@
 LDAP=@PBX_LDAP@
 LIBEDIT=@PBX_LIBEDIT@
 LIBJWT=@PBX_LIBJWT@
diff --git a/configure b/configure
index 07764740dc7..17d04cbea6d 100755
--- a/configure
+++ b/configure
@@ -1017,6 +1017,10 @@ PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK
 PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR
 PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE
 PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB
+PBX_LAME
+LAME_DIR
+LAME_INCLUDE
+LAME_LIB
 PBX_BEANSTALK
 BEANSTALK_DIR
 BEANSTALK_INCLUDE
@@ -1442,6 +1446,7 @@ with_opus
 with_opusfile
 with_postgres
 with_beanstalk
+with_mp3lame
 with_pjproject
 with_popt
 with_portaudio
@@ -2216,6 +2221,7 @@ Optional Packages:
   --with-opusfile=PATH    use Opusfile files in PATH
   --with-postgres=PATH    use PostgreSQL files in PATH
   --with-beanstalk=PATH   use Beanstalk Job Queue files in PATH
+  --with-mp3lame=PATH     use LAME MP3 files in PATH
   --with-pjproject=PATH   use PJPROJECT files in PATH
   --with-popt=PATH        use popt files in PATH
   --with-portaudio=PATH   use PortAudio files in PATH
@@ -6056,11 +6062,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_cxx11=no
+  ac_cv_prog_cxx_11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6102,11 +6108,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_cxx98=no
+  ac_cv_prog_cxx_98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10341,8 +10347,8 @@ printf "%s\n" "$as_me: checking whether system openssl > 1.1.0" >&6;}
       if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.0" >&5
-printf %s "checking for openssl >= 1.1.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
+printf %s "checking for OPENSSL... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
@@ -10382,7 +10388,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10391,27 +10397,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
         else
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.1.0" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$OPENSSL_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$OPENSSL_PKG_ERRORS" >&5
 
 
             PBX_OPENSSL=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
 
 else
-        OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-        OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -10432,8 +10438,8 @@ printf "%s\n" "$as_me: checking whether alternate openssl11 is installed" >&6;}
       if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl11" >&5
-printf %s "checking for openssl11... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
+printf %s "checking for OPENSSL... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
@@ -10473,7 +10479,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10482,27 +10488,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl11" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl11" 2>&1`
         else
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl11" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl11" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$OPENSSL_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$OPENSSL_PKG_ERRORS" >&5
 
 
             PBX_OPENSSL=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
 
 else
-        OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-        OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -10528,8 +10534,8 @@ printf "%s\n" "$as_me: checking fallback system openssl" >&6;}
       if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-printf %s "checking for openssl... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
+printf %s "checking for OPENSSL... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
@@ -10569,7 +10575,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10578,27 +10584,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
         else
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$OPENSSL_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$OPENSSL_PKG_ERRORS" >&5
 
 
             PBX_OPENSSL=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
 
 else
-        OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-        OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -13152,6 +13158,39 @@ fi
 
 
 
+    LAME_DESCRIP="LAME MP3"
+    LAME_OPTION="mp3lame"
+    PBX_LAME=0
+
+# Check whether --with-mp3lame was given.
+if test ${with_mp3lame+y}
+then :
+  withval=$with_mp3lame;
+	case ${withval} in
+	n|no)
+	USE_LAME=no
+	# -1 is a magic value used by menuselect to know that the package
+	# was disabled, other than 'not found'
+	PBX_LAME=-1
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} LAME"
+	;;
+	*)
+	LAME_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} LAME"
+	;;
+	esac
+
+fi
+
+
+
+
+
+
+
+
 if test "x${PBX_PJPROJECT}" != "x1" ; then
 
     PJPROJECT_DESCRIP="PJPROJECT"
@@ -15087,8 +15126,8 @@ fi
       if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
-printf %s "checking for libedit... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5
+printf %s "checking for LIBEDIT... " >&6; }
 
 if test -n "$LIBEDIT_CFLAGS"; then
     pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"
@@ -15128,7 +15167,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15137,27 +15176,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
+	        LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
         else
-                LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
+	        LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$LIBEDIT_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBEDIT_PKG_ERRORS" >&5
 
 
             PBX_LIBEDIT=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_LIBEDIT=0
 
 
 else
-        LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
-        LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
+	LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
+	LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -15548,8 +15587,8 @@ if test "$JANSSON_BUNDLED" = "no" ; then
       if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5
-printf %s "checking for jansson >= 2.11... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
+printf %s "checking for JANSSON... " >&6; }
 
 if test -n "$JANSSON_CFLAGS"; then
     pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
@@ -15589,7 +15628,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15598,27 +15637,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.11" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.11" 2>&1`
         else
-                JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.11" 2>&1`
+	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.11" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$JANSSON_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$JANSSON_PKG_ERRORS" >&5
 
 
             PBX_JANSSON=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_JANSSON=0
 
 
 else
-        JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
-        JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
+	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
+	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -15781,8 +15820,8 @@ if test "$LIBJWT_BUNDLED" = "no" ; then
       if test "x${PBX_LIBJWT}" != "x1" -a "${USE_LIBJWT}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjwt >= $LIBJWT_VERSION" >&5
-printf %s "checking for libjwt >= $LIBJWT_VERSION... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBJWT" >&5
+printf %s "checking for LIBJWT... " >&6; }
 
 if test -n "$LIBJWT_CFLAGS"; then
     pkg_cv_LIBJWT_CFLAGS="$LIBJWT_CFLAGS"
@@ -15822,7 +15861,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -15831,27 +15870,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                LIBJWT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libjwt >= $LIBJWT_VERSION" 2>&1`
+	        LIBJWT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libjwt >= $LIBJWT_VERSION" 2>&1`
         else
-                LIBJWT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libjwt >= $LIBJWT_VERSION" 2>&1`
+	        LIBJWT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libjwt >= $LIBJWT_VERSION" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$LIBJWT_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBJWT_PKG_ERRORS" >&5
 
 
             PBX_LIBJWT=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_LIBJWT=0
 
 
 else
-        LIBJWT_CFLAGS=$pkg_cv_LIBJWT_CFLAGS
-        LIBJWT_LIBS=$pkg_cv_LIBJWT_LIBS
+	LIBJWT_CFLAGS=$pkg_cv_LIBJWT_CFLAGS
+	LIBJWT_LIBS=$pkg_cv_LIBJWT_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -15961,8 +16000,8 @@ fi
       if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5
-printf %s "checking for libxml-2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+printf %s "checking for LIBXML2... " >&6; }
 
 if test -n "$LIBXML2_CFLAGS"; then
     pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
@@ -16002,7 +16041,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16011,27 +16050,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
         else
-                LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$LIBXML2_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBXML2_PKG_ERRORS" >&5
 
 
             PBX_LIBXML2=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_LIBXML2=0
 
 
 else
-        LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
-        LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -22225,6 +22264,102 @@ fi
 # do the package library checks now
 
 
+if test "x${PBX_LAME}" != "x1" -a "${USE_LAME}" != "no"; then
+   pbxlibdir=""
+   # if --with-LAME=DIR has been specified, use it.
+   if test "x${LAME_DIR}" != "x"; then
+      if test -d ${LAME_DIR}/lib; then
+         pbxlibdir="-L${LAME_DIR}/lib"
+      else
+         pbxlibdir="-L${LAME_DIR}"
+      fi
+   fi
+
+      ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
+      CFLAGS="${CFLAGS} "
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for get_lame_version in -lmp3lame" >&5
+printf %s "checking for get_lame_version in -lmp3lame... " >&6; }
+if test ${ac_cv_lib_mp3lame_get_lame_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmp3lame ${pbxlibdir}  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char get_lame_version ();
+int
+main (void)
+{
+return get_lame_version ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_mp3lame_get_lame_version=yes
+else $as_nop
+  ac_cv_lib_mp3lame_get_lame_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame_get_lame_version" >&5
+printf "%s\n" "$ac_cv_lib_mp3lame_get_lame_version" >&6; }
+if test "x$ac_cv_lib_mp3lame_get_lame_version" = xyes
+then :
+  AST_LAME_FOUND=yes
+else $as_nop
+  AST_LAME_FOUND=no
+fi
+
+      CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
+
+
+   # now check for the header.
+   if test "${AST_LAME_FOUND}" = "yes"; then
+      LAME_LIB="${pbxlibdir} -lmp3lame "
+      # if --with-LAME=DIR has been specified, use it.
+      if test "x${LAME_DIR}" != "x"; then
+         LAME_INCLUDE="-I${LAME_DIR}/include"
+      fi
+      LAME_INCLUDE="${LAME_INCLUDE} "
+
+         # check for the header
+         ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
+         CPPFLAGS="${CPPFLAGS} ${LAME_INCLUDE}"
+         ac_fn_c_check_header_compile "$LINENO" "lame/lame.h" "ac_cv_header_lame_lame_h" "$ac_includes_default"
+if test "x$ac_cv_header_lame_lame_h" = xyes
+then :
+  LAME_HEADER_FOUND=1
+else $as_nop
+  LAME_HEADER_FOUND=0
+fi
+
+         CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
+
+      if test "x${LAME_HEADER_FOUND}" = "x0" ; then
+         LAME_LIB=""
+         LAME_INCLUDE=""
+      else
+
+         PBX_LAME=1
+         cat >>confdefs.h <<_ACEOF
+#define HAVE_LAME 1
+_ACEOF
+
+      fi
+   fi
+fi
+
+
+
 if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then
    pbxlibdir=""
    # if --with-BFD=DIR has been specified, use it.
@@ -23137,8 +23272,8 @@ if test "${USE_ILBC}" != "no"; then
       if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libilbc < 3" >&5
-printf %s "checking for libilbc < 3... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ILBC" >&5
+printf %s "checking for ILBC... " >&6; }
 
 if test -n "$ILBC_CFLAGS"; then
     pkg_cv_ILBC_CFLAGS="$ILBC_CFLAGS"
@@ -23178,7 +23313,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -23187,27 +23322,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                ILBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libilbc < 3" 2>&1`
+	        ILBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libilbc < 3" 2>&1`
         else
-                ILBC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libilbc < 3" 2>&1`
+	        ILBC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libilbc < 3" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$ILBC_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$ILBC_PKG_ERRORS" >&5
 
 
             PBX_ILBC=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_ILBC=0
 
 
 else
-        ILBC_CFLAGS=$pkg_cv_ILBC_CFLAGS
-        ILBC_LIBS=$pkg_cv_ILBC_LIBS
+	ILBC_CFLAGS=$pkg_cv_ILBC_CFLAGS
+	ILBC_LIBS=$pkg_cv_ILBC_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -25396,8 +25531,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
       if test "x${PBX_NETSNMP}" != "x1" -a "${USE_NETSNMP}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for netsnmp-agent" >&5
-printf %s "checking for netsnmp-agent... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NETSNMP" >&5
+printf %s "checking for NETSNMP... " >&6; }
 
 if test -n "$NETSNMP_CFLAGS"; then
     pkg_cv_NETSNMP_CFLAGS="$NETSNMP_CFLAGS"
@@ -25437,7 +25572,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -25446,27 +25581,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                NETSNMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "netsnmp-agent" 2>&1`
+	        NETSNMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "netsnmp-agent" 2>&1`
         else
-                NETSNMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "netsnmp-agent" 2>&1`
+	        NETSNMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "netsnmp-agent" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$NETSNMP_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$NETSNMP_PKG_ERRORS" >&5
 
 
             PBX_NETSNMP=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_NETSNMP=0
 
 
 else
-        NETSNMP_CFLAGS=$pkg_cv_NETSNMP_CFLAGS
-        NETSNMP_LIBS=$pkg_cv_NETSNMP_LIBS
+	NETSNMP_CFLAGS=$pkg_cv_NETSNMP_CFLAGS
+	NETSNMP_LIBS=$pkg_cv_NETSNMP_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -26823,8 +26958,8 @@ if test "$USE_PJPROJECT" != "no" ; then
       if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5
-printf %s "checking for libpjproject... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PJPROJECT" >&5
+printf %s "checking for PJPROJECT... " >&6; }
 
 if test -n "$PJPROJECT_CFLAGS"; then
     pkg_cv_PJPROJECT_CFLAGS="$PJPROJECT_CFLAGS"
@@ -26864,7 +26999,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -26873,27 +27008,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                PJPROJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpjproject" 2>&1`
+	        PJPROJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpjproject" 2>&1`
         else
-                PJPROJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpjproject" 2>&1`
+	        PJPROJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpjproject" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$PJPROJECT_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$PJPROJECT_PKG_ERRORS" >&5
 
 
             PBX_PJPROJECT=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_PJPROJECT=0
 
 
 else
-        PJPROJECT_CFLAGS=$pkg_cv_PJPROJECT_CFLAGS
-        PJPROJECT_LIBS=$pkg_cv_PJPROJECT_LIBS
+	PJPROJECT_CFLAGS=$pkg_cv_PJPROJECT_CFLAGS
+	PJPROJECT_LIBS=$pkg_cv_PJPROJECT_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28302,8 +28437,8 @@ fi
       if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python-2.7" >&5
-printf %s "checking for python-2.7... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
+printf %s "checking for PYTHONDEV... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
@@ -28343,7 +28478,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -28352,27 +28487,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-2.7" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-2.7" 2>&1`
         else
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-2.7" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-2.7" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$PYTHONDEV_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$PYTHONDEV_PKG_ERRORS" >&5
 
 
             PBX_PYTHONDEV=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
 
 else
-        PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
-        PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
+	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
+	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28390,8 +28525,8 @@ fi
       if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python2" >&5
-printf %s "checking for python2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
+printf %s "checking for PYTHONDEV... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
@@ -28431,7 +28566,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -28440,27 +28575,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python2" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python2" 2>&1`
         else
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python2" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python2" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$PYTHONDEV_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$PYTHONDEV_PKG_ERRORS" >&5
 
 
             PBX_PYTHONDEV=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
 
 else
-        PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
-        PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
+	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
+	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28478,8 +28613,8 @@ fi
       if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python" >&5
-printf %s "checking for python... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
+printf %s "checking for PYTHONDEV... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
@@ -28519,7 +28654,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -28528,27 +28663,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python" 2>&1`
         else
-                PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python" 2>&1`
+	        PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$PYTHONDEV_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$PYTHONDEV_PKG_ERRORS" >&5
 
 
             PBX_PYTHONDEV=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
 
 else
-        PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
-        PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
+	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
+	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28674,8 +28809,8 @@ fi
       if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5
-printf %s "checking for portaudio-2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
+printf %s "checking for PORTAUDIO... " >&6; }
 
 if test -n "$PORTAUDIO_CFLAGS"; then
     pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
@@ -28715,7 +28850,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -28724,27 +28859,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "portaudio-2.0" 2>&1`
+	        PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "portaudio-2.0" 2>&1`
         else
-                PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "portaudio-2.0" 2>&1`
+	        PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "portaudio-2.0" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$PORTAUDIO_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$PORTAUDIO_PKG_ERRORS" >&5
 
 
             PBX_PORTAUDIO=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_PORTAUDIO=0
 
 
 else
-        PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
-        PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
+	PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
+	PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -34461,8 +34596,8 @@ for ver in 3.0 2.6 2.4 2.2 2.0; do
       if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5
-printf %s "checking for gmime-$ver... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GMIME" >&5
+printf %s "checking for GMIME... " >&6; }
 
 if test -n "$GMIME_CFLAGS"; then
     pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"
@@ -34502,7 +34637,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -34511,27 +34646,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmime-$ver" 2>&1`
+	        GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmime-$ver" 2>&1`
         else
-                GMIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmime-$ver" 2>&1`
+	        GMIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmime-$ver" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$GMIME_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$GMIME_PKG_ERRORS" >&5
 
 
             PBX_GMIME=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_GMIME=0
 
 
 else
-        GMIME_CFLAGS=$pkg_cv_GMIME_CFLAGS
-        GMIME_LIBS=$pkg_cv_GMIME_LIBS
+	GMIME_CFLAGS=$pkg_cv_GMIME_CFLAGS
+	GMIME_LIBS=$pkg_cv_GMIME_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -35726,8 +35861,8 @@ fi
       if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
-printf %s "checking for gtk+-2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
+printf %s "checking for GTK2... " >&6; }
 
 if test -n "$GTK2_CFLAGS"; then
     pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
@@ -35767,7 +35902,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -35776,27 +35911,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0" 2>&1`
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0" 2>&1`
         else
-                GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0" 2>&1`
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$GTK2_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK2_PKG_ERRORS" >&5
 
 
             PBX_GTK2=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_GTK2=0
 
 
 else
-        GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
-        GTK2_LIBS=$pkg_cv_GTK2_LIBS
+	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
+	GTK2_LIBS=$pkg_cv_GTK2_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -35837,8 +35972,8 @@ fi
       if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
-printf %s "checking for libsystemd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+printf %s "checking for SYSTEMD... " >&6; }
 
 if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
@@ -35878,7 +36013,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -35887,27 +36022,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
         else
-                SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$SYSTEMD_PKG_ERRORS" >&5
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_PKG_ERRORS" >&5
 
 
             PBX_SYSTEMD=0
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             PBX_SYSTEMD=0
 
 
 else
-        SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
-        SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
diff --git a/configure.ac b/configure.ac
index 0e1a11eedad..b706e2a40b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -579,6 +579,7 @@ AST_EXT_LIB_SETUP([OPUS], [Opus], [opus])
 AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
 AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
 AST_EXT_LIB_SETUP([BEANSTALK], [Beanstalk Job Queue], [beanstalk])
+AST_EXT_LIB_SETUP([LAME], [LAME MP3], [mp3lame])
 
 if test "x${PBX_PJPROJECT}" != "x1" ; then
 AST_EXT_LIB_SETUP([PJPROJECT], [PJPROJECT], [pjproject])
@@ -1630,6 +1631,7 @@ fi
 
 # do the package library checks now
 
+AST_EXT_LIB_CHECK([LAME], [mp3lame], [get_lame_version], [lame/lame.h])
 AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h])
 # Fedora/RedHat/CentOS require extra libraries
 AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty])
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index 2927ec13c1a..c5aa7be5bad 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -25,7 +25,7 @@ PACKAGES_DEBIAN="$PACKAGES_DEBIAN libedit-dev libjansson-dev libsqlite3-dev uuid
 # Asterisk: for addons:
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libneon27-dev libgmime-2.6-dev libgmime-3.0-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libjack-jackd2-dev bash libcap-dev"
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libjack-jackd2-dev bash libcap-dev libmp3lame-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcodec2-dev libfftw3-dev libsndfile1-dev libunbound-dev"
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index debf540c3b8..85afbe2adae 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -414,6 +414,9 @@
 /* Define to 1 if you have the kqueue support library. */
 #undef HAVE_KQUEUE
 
+/* Define to 1 if you have the LAME MP3 library. */
+#undef HAVE_LAME
+
 /* Define to 1 if you have the OpenLDAP library. */
 #undef HAVE_LDAP
 
diff --git a/makeopts.in b/makeopts.in
index f7824f34762..782ad75a5f5 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -194,6 +194,9 @@ LIBJWT_CONFIGURE_OPTS=@LIBJWT_CONFIGURE_OPTS@
 URIPARSER_INCLUDE=@URIPARSER_INCLUDE@
 URIPARSER_LIB=@URIPARSER_LIB@
 
+LAME_INCLUDE=@LAME_INCLUDE@
+LAME_LIB=@LAME_LIB@
+
 LDAP_INCLUDE=@LDAP_INCLUDE@
 LDAP_LIB=@LDAP_LIB@