retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-9081 [Ubuntu Packaging] WIP Patches to build system and configure to allow FS to build on 14.04

This commit is contained in:
Ken Rice 2016-04-19 12:55:26 -05:00
parent 9b1d5c35f6
commit 7375ad9e89
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -819,7 +819,7 @@ if test "x$have_libz" = "xyes" ; then
APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
fi
PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[
PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
AM_CONDITIONAL([HAVE_MPG123],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
@ -1300,7 +1300,7 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[
AM_CONDITIONAL([HAVE_SNDFILE],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])
PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[
PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
AM_CONDITIONAL([HAVE_MPG123],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
@ -1379,7 +1379,7 @@ PKG_CHECK_MODULES([OPUS], [opus >= 1.1],[
AM_CONDITIONAL([HAVE_OPUS],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUS],[false])])
PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.1],[
PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.0],[
AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])])

4
debian/util.sh vendored
View File

@ -292,7 +292,9 @@ build_debs () {
if [ "$custom_sources_file" == "/etc/apt/sources.list" ]; then
# If you are using the system sources, then it is reasonable that you expect to use all of the supplementary repos too
cat /etc/apt/sources.list > /tmp/fs.sources.list
for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
if [ "$(ls -A /etc/apt/sources.list.d)" ]; then
for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
fi
custom_sources_file="/tmp/fs.sources.list"
apt-key exportall > "/tmp/fs.asc"
custom_keyring="/tmp/fs.asc"