Skip to content
Snippets Groups Projects
Commit 66b57ce2 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#5267] Update configuration for libcelt-dev

parent 1d692d41
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59 ...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.65) AC_PREREQ([2.67])
AC_INIT([sflphone],[0.9.12],[sflphoneteam@savoirfairelinux.com],[sflphone]) AC_INIT([sflphone],[0.9.12],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011]]) AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011]])
AC_REVISION([$Revision$]) AC_REVISION([$Revision$])
...@@ -78,7 +78,7 @@ AC_CONFIG_FILES([doc/Makefile \ ...@@ -78,7 +78,7 @@ AC_CONFIG_FILES([doc/Makefile \
doc/doxygen/Makefile]) doc/doxygen/Makefile])
dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h)) dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
dnl AM_CONFIG_HEADER(config.h) dnl AC_CONFIG_HEADERS([config.h])
dnl Settings need Standard C++ Library dnl Settings need Standard C++ Library
LIBS="$LIBS -lstdc++" LIBS="$LIBS -lstdc++"
...@@ -215,7 +215,7 @@ AC_SUBST(CCEXT2_CFLAGS) ...@@ -215,7 +215,7 @@ AC_SUBST(CCEXT2_CFLAGS)
AC_SUBST(CCRTP_CFLAGS) AC_SUBST(CCRTP_CFLAGS)
dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support
PKG_CHECK_MODULES([libssl], libssl,, AC_MSG_ERROR([Mising ssl development package: libssl-dev]])) PKG_CHECK_MODULES([libssl], libssl,, AC_MSG_ERROR([Mising ssl development package: libssl-dev]))
AC_SUBST(libssl_CFLAGS) AC_SUBST(libssl_CFLAGS)
AC_SUBST(libssl_LIBS) AC_SUBST(libssl_LIBS)
...@@ -230,8 +230,7 @@ dnl DBus-C++ detection (used to be in library own build system) ...@@ -230,8 +230,7 @@ dnl DBus-C++ detection (used to be in library own build system)
DBUS_REQUIRED_VERSION=0.60 DBUS_REQUIRED_VERSION=0.60
PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],, PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],,
AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)] AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)]
[http://gitorious.org/dbus-cplusplus]) [http://gitorious.org/dbus-cplusplus]))
)
AC_SUBST(dbus_CFLAGS) AC_SUBST(dbus_CFLAGS)
AC_SUBST(dbus_LIBS) AC_SUBST(dbus_LIBS)
...@@ -379,55 +378,29 @@ AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the ...@@ -379,55 +378,29 @@ AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the
AC_CHECK_LIB(speexdsp, speex_preprocess_run, [], [], []) AC_CHECK_LIB(speexdsp, speex_preprocess_run, [], [], [])
AM_CONDITIONAL(ENABLE_SPEEXDSP, test "x$HAVE_SPEEXDSP" = xyes) AM_CONDITIONAL(ENABLE_SPEEXDSP, test "x$HAVE_SPEEXDSP" = xyes)
dnl Check for celt. Compile it only if a recent enough version is found
#LIBCELT_MIN_VERSION=0.7.1 # check for libcelt
# AC_ARG_WITH([celt], AC_ARG_WITH([celt],
# [AS_HELP_STRING([--without-celt], [AS_HELP_STRING([--without-celt],
# [disable support for celt codec])], [disable support for celt codec])],
# [], [],
# [with_celt=yes]) [with_celt=yes])
# AS_IF([test "x$with_celt" != xno], AS_IF([test "x$with_celt" != xno],
# [AC_CHECK_HEADER([celt/celt.h], , AC_MSG_FAILURE([Unable to find the libcelt headers (you may need to install the dev package). You may use --without-celt to compile without celt codec support.]))]
# [AC_CHECK_LIB([celt], [celt_decode_ctl],
# [],
# [AC_MSG_FAILURE([libcelt link test failed. You may use --without-celt to compile without celt codec support.])])
# ])
#AC_DEFINE([HAVE_CELT], test "x$with_celt" = "xyes", [Define if you have libcelt])
#AM_CONDITIONAL(BUILD_CELT, test "x$with_celt" = "xyes"
with_celt=no
PKG_CHECK_MODULES(CELT, celt >= 0.9.1, PKG_CHECK_MODULES(CELT, celt >= 0.9.1,
[ [
BUILD_CELT=91 ; with_celt=yes BUILD_CELT=91 ; with_celt=yes
], ],
[ [
PKG_CHECK_MODULES(CELT, celt >= 0.7.1) PKG_CHECK_MODULES(CELT, celt >= 0.7.1,,AC_MSG_FAILURE([libcelt link test failed. You may use --without-celt to compile without celt codec support.]))
BUILD_CELT=71;with_celt=yes BUILD_CELT=71; with_celt=yes;
]) ])
)
AC_SUBST(BUILD_CELT) AC_SUBST(BUILD_CELT)
AM_CONDITIONAL(BUILD_CELT, test "x$with_celt" = "xyes" ) AM_CONDITIONAL(BUILD_CELT, test "x$with_celt" = "xyes" )
#PKG_CHECK_MODULES(CELT, celt >= ${LIBCELT_MIN_VERSION}, [with_celt=yes], [with_celt=no])
#PKG_CHECK_MODULES(CELT, celt >= 0.9.1, [with_celt_091=yes], [with_celt_091=no])
#AM_CONDITIONAL(CELT_091, test "x$with_celt_091" = "xyes")
#if test "x$with_celt_091" = "xyes"; then
#AC_MSG_RESULT([Using Celt 0.9.1])
#fi
dnl Check for IAX dnl Check for IAX
AC_ARG_WITH([iax2], AC_ARG_WITH([iax2],
[AS_HELP_STRING([--without-iax2], [AS_HELP_STRING([--without-iax2],
...@@ -496,12 +469,10 @@ AC_DEFUN([BB_ENABLE_DOXYGEN], ...@@ -496,12 +469,10 @@ AC_DEFUN([BB_ENABLE_DOXYGEN],
AC_SUBST(DBUS_SERVICES_DIR) AC_SUBST(DBUS_SERVICES_DIR)
AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
AC_CONFIG_COMMANDS_POST([(cd libs/pjproject/ && ./configure)]) AC_CONFIG_COMMANDS_POST([(cd libs/pjproject/ && ./autogen.sh && ./configure --prefix=/usr)])
# Go! # Go!
AC_SUBST(SFLPHONE_CFLAGS) AC_SUBST(SFLPHONE_CFLAGS)
AC_SUBST(SFLPHONE_LIBS) AC_SUBST(SFLPHONE_LIBS)
AC_OUTPUT AC_OUTPUT
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject) has already been compiled. Run `make' to build the software.]])
...@@ -21,8 +21,8 @@ configure-stamp: ...@@ -21,8 +21,8 @@ configure-stamp:
dh_testdir dh_testdir
# Add here commands to configure the package. # Add here commands to configure the package.
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr --without-celt
cd libs/pjproject; ./autogen.sh; ./configure --prefix=/usr # cd libs/pjproject; ./autogen.sh; ./configure --prefix=/usr
touch configure-stamp touch configure-stamp
#Architecture #Architecture
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment