repair build (buggy AM_CONDITIONAL) and update README.macos

README.macos

@@ -16,8 +16,6 @@ You need:
 
 - Install some linphone dependencies with macports
  $ sudo port install speex
- $ sudo port install libosip2 # WARNING: currently outdated in macport
- $ sudo port install libeXosip2 #WARNING: currently outdated in macport
  $ sudo port install ffmpeg-devel -gpl2
  $ sudo port install libvpx
  $ sudo port install readline
@@ -37,6 +35,13 @@ You need:
 The softwares below need to be compiled manually. To ensure compatibility with multiple mac os version it is recommended to do:
  $ export MACOSX_DEPLOYMENT_TARGET=10.6 
 
+
+- Install belle-sip (sip stack)
+ $ git clone git://git.linphone.org/belle-sip.git
+ $ cd belle-sip
+ $ ./autogen.sh && ./configure --prefix=/opt/local && make
+ $ sudo make install
+
 - Install srtp (optional) for call encryption
  $ sudo port install srtp
  If that fails, get from source:

configure.ac

@@ -685,13 +685,10 @@ if test x$enable_msg_storage != xfalse; then
 fi
 
 	
-PKG_CHECK_MODULES(BELLESIP, [belle-sip],[bellesip_found=yes],foo=bar)
-
-AM_CONDITIONAL([USE_BELLESIP], [test "x$bellesip_found" == "xyes"])
+PKG_CHECK_MODULES(BELLESIP, [belle-sip])
 
 SIPSTACK_CFLAGS="$BELLESIP_CFLAGS"
 SIPSTACK_LIBS="$BELLESIP_LIBS"
-AC_DEFINE(USE_BELLESIP,1,[Defined when bellesip is used])
 
 
 AC_SUBST(SIPSTACK_CFLAGS)

coreapi/Makefile.am

@@ -53,7 +53,6 @@ if BUILD_UPNP
 liblinphone_la_SOURCES+=upnp.c upnp.h
 endif
 	
-if USE_BELLESIP
 liblinphone_la_SOURCES+=	bellesip_sal/sal_address_impl.c \
 				bellesip_sal/sal_impl.c \
 				bellesip_sal/sal_op_impl.c \
@@ -66,11 +65,7 @@ liblinphone_la_SOURCES+=	bellesip_sal/sal_address_impl.c \
 				bellesip_sal/sal_op_call_transfer.c \
 				bellesip_sal/sal_op_info.c \
 				bellesip_sal/sal_op_events.c
-else
-liblinphone_la_SOURCES+= 	sal_eXosip2.c sal_eXosip2.h\
-							sal_eXosip2_sdp.c \
-							sal_eXosip2_presence.c 	
-endif
+
 if BUILD_WIZARD
 liblinphone_la_SOURCES+=sipwizard.c 
 endif
@@ -133,9 +128,8 @@ AM_CFLAGS=\
 if BUILD_WIZARD
 AM_CFLAGS+= -DBUILD_WIZARD 
 endif
-if USE_BELLESIP
+
 AM_CFLAGS+= -DUSE_BELLESIP
-endif
 
 AM_CXXFLAGS=$(AM_CFLAGS)