From 4341b8e6e48cb756fc2192dd5cf4ef9312e8ac0a Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 28 Mar 2007 18:46:07 +0000 Subject: [PATCH] add --disable-resample configure option to build without resampler support git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4783 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 6 ++++-- configure.in | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cedd48174a..b381c219fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,12 +80,12 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -CORE_CFLAGS += -I$(switch_srcdir)/libs/libresample/include +CORE_CFLAGS += $(RESAMPLE_CFLAGS) CORE_CFLAGS += -I$(switch_srcdir)/libs/libteletone/src CORE_LIBS = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la -CORE_LIBS += libs/srtp/libsrtp.la libs/libresample/libresample.la +CORE_LIBS += libs/srtp/libsrtp.la $(RESAMPLE_LIB) lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) @@ -171,9 +171,11 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update @cd libs/srtp && $(MAKE) @$(TOUCH_TARGET) +if USE_INTREE_RESAMPLE libs/libresample/libresample.la: libs/libresample libs/libresample/.update @cd libs/libresample && $(MAKE) @$(TOUCH_TARGET) +endif core: libfreeswitch.la diff --git a/configure.in b/configure.in index 8107ae4683..219eb48364 100644 --- a/configure.in +++ b/configure.in @@ -57,6 +57,26 @@ fi AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) +# Optional Features + +AC_ARG_ENABLE(resample, +[AC_HELP_STRING([--enable-resample],[build with embedded resamper])],[enable_resample="$enable_resample"],[enable_resample="yes"]) + +# We should add checking for out of tree libresample here +RESAMPLE_LIB= +RESAMPLE_CFLAGS= +if test "${enable_resample}" = "yes"; then + RESAMPLE_LIB="libs/libresample/libresample.la" + RESAMPLE_CFLAGS="-I${switch_srcdir}/libs/libresample/include" +else + AC_DEFINE([DISABLE_RESAMPLE],[],[Disable the embedded resampler]) +fi + +AC_SUBST(RESAMPLE_LIB) +AC_SUBST(RESAMPLE_CFLAGS) + +AM_CONDITIONAL([USE_INTREE_RESAMPLE],[test "${enable_resample}" = "yes"]) + # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include"