From b9f62a4dea5b8e7ba54326d278e836836bcdf0d0 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Wed, 15 Apr 2009 07:43:39 +0000
Subject: [PATCH] make it better.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@419 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/configure.in           | 5 +++--
 linphone/coreapi/linphonecore.c | 4 ++--
 linphone/po/Makefile.in.in      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/linphone/configure.in b/linphone/configure.in
index 5602ed183..03cde7ae1 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.1.1],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.1.1.1],[linphone-developers@nongnu.org])
 
 dnl Source packaging numbers
 
@@ -22,7 +22,7 @@ AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
 
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_CONFIG_HEADER(config.h)
-
+AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([mkdir_p])
 AC_ISC_POSIX
 AC_PROG_CC
@@ -34,6 +34,7 @@ ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
 dnl Initialize libtool
 AC_PROG_LIBTOOL
 AM_PROG_LIBTOOL
+
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 dnl Add the languages which your application supports here.
diff --git a/linphone/coreapi/linphonecore.c b/linphone/coreapi/linphonecore.c
index 655cb7fb0..cea010d91 100644
--- a/linphone/coreapi/linphonecore.c
+++ b/linphone/coreapi/linphonecore.c
@@ -1423,7 +1423,7 @@ void linphone_core_init_media_streams(LinphoneCore *lc){
 			audio_stream_enable_echo_limiter(lc->audiostream,ELControlMic);
 		else if (strcasecmp(type,"speaker")==0)
 			audio_stream_enable_echo_limiter(lc->audiostream,ELControlSpeaker);
-		if (gain>0){
+		if (gain!=-1){
 			audio_stream_enable_gain_control(lc->audiostream,TRUE);
 		}
 		
@@ -1470,7 +1470,7 @@ static void post_configure_audio_streams(LinphoneCore *lc){
 		if (force!=-1)
 			ms_filter_call_method(f,MS_VOLUME_SET_EA_FORCE,&force);
 		if (gain!=-1)
-			ms_filter_call_method(st->volsend,MS_VOLUME_SET_GAIN,&gain);
+			audio_stream_set_mic_gain(st,gain);
 	}
 	if (lc->vtable.dtmf_received!=NULL){
 		/* replace by our default action*/
diff --git a/linphone/po/Makefile.in.in b/linphone/po/Makefile.in.in
index 57ef267b3..c7e83022c 100644
--- a/linphone/po/Makefile.in.in
+++ b/linphone/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)