From 4c2d060eb56d37aa8b94e59c0687d89c070c2ae4 Mon Sep 17 00:00:00 2001 From: paulc Date: Mon, 5 Oct 2009 10:36:37 +0000 Subject: [PATCH] It is possible to configure --with-spandsp=static to avoid runtime version trouble. git-svn-id: http://yate.null.ro/svn/yate/trunk@2865 acf43c95-373e-0410-b603-e72c3f656dc1 --- configure.in | 6 ++++++ modules/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 744c2b25..9ed7b9b2 100644 --- a/configure.in +++ b/configure.in @@ -659,7 +659,12 @@ AC_SUBST(AMRNB_LIB) HAVE_SPANDSP=no SPANDSP_INC="" +SPANDSP_LIB="-lspandsp" AC_ARG_WITH(spandsp,AC_HELP_STRING([--with-spandsp],[use spandsp library if available (default)]),[ac_cv_use_spandsp=$withval],[ac_cv_use_spandsp=yes]) +if [[ "x$ac_cv_use_spandsp" = "xstatic" ]]; then + ac_cv_use_spandsp="yes" + SPANDSP_LIB="-Wl,-Bstatic -lspandsp -ltiff -lz -ljpeg -Wl,-Bdynamic" +fi if [[ "x$ac_cv_use_spandsp" = "xyes" ]]; then for i in /usr/include /usr/local/include; do ac_cv_use_spandsp="$i" @@ -763,6 +768,7 @@ AC_MSG_RESULT([$HAVE_SPANDSP]) fi AC_SUBST(HAVE_SPANDSP) AC_SUBST(SPANDSP_INC) +AC_SUBST(SPANDSP_LIB) HAVE_PWLIB=no diff --git a/modules/Makefile.in b/modules/Makefile.in index 05559880..3dd76544 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -271,7 +271,7 @@ speexcodec.yate: LOCALFLAGS = @SPEEX_INC@ amrnbcodec.yate: LOCALFLAGS = @AMRNB_INC@ amrnbcodec.yate: LOCALLIBS = @AMRNB_LIB@ -faxchan.yate: LOCALLIBS = -lspandsp +faxchan.yate: LOCALLIBS = @SPANDSP_LIB@ faxchan.yate: LOCALFLAGS = @SPANDSP_INC@ ysipchan.yate: ../libs/ysip/libyatesip.a ../libs/ysdp/libyatesdp.a