add openssl compilation

diff --git a/configure.ac b/configure.ac
index 0615cc48f2f47898bc00ff96f3c892aedd674d53..3053a71dd25721e9cefcd9c0c4c11572f6cf20e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,18 @@ AC_CHECK_FUNCS(getifaddrs)
 dnl check for osip2
 LP_CHECK_OSIP2
 
+dnl conditionnal build for ssl
+AC_ARG_ENABLE(ssl,
+               [  --enable-ssl    Turn on ssl support compiling. Required for sip tls. default = false],
+               [case "${enableval}" in
+               yes) build_ssl=true ;;
+               no)  build_ssl=false ;;
+               *) AC_MSG_ERROR(bad value ${enableval} for --enable-ssl) ;;
+               esac],[build_ssl=false])
+
+if test "$build_ssl" = "true"; then
+       PKG_CHECK_MODULES(OPENSSL, libssl >= 0.9.8)
+fi
 dnl setup flags for exosip library
 LP_SETUP_EXOSIP
 
@@ -272,7 +284,6 @@ dnl Furthermore it is good to repeat here all mediastreamer2 toggles
 dnl since top-level configure --help will not print them.
 
 PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, build_speex=yes)
-AC_SUBST(SPEEX_LIBS)
 
 dnl conditionnal build of video support
 AC_ARG_ENABLE(video,

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 8f88045f568a2c3993ffa01b6b705e5f03c1d3b8..a362dda837bf66a2b4ab28a46222cd5b9462ed14 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -44,7 +44,7 @@ liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 liblinphone_la_LIBADD= \
                $(EXOSIP_LIBS) \
                $(MEDIASTREAMER_LIBS) \
-               $(ORTP_LIBS)
+               $(ORTP_LIBS) $(OPENSSL_LIBS)
 
 if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
@@ -54,15 +54,11 @@ noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c
 
-test_lsd_LDADD=liblinphone.la \
-                                                       $(MEDIASTREAMER_LIBS) \
-                                                       $(ORTP_LIBS)
+test_lsd_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
 test_ecc_SOURCES=test_ecc.c
 
-test_ecc_LDADD=liblinphone.la \
-                                                       $(MEDIASTREAMER_LIBS) \
-                                                       $(ORTP_LIBS)
+test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
 
 

diff --git a/m4/exosip.m4 b/m4/exosip.m4
index c25d8ad96347dc09e93bcb1a910b53961c01fe37..cf1db587db3bca1925573a83a288cd39affaf353 100644 (file)
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -23,7 +23,7 @@ CPPFLAGS=$CPPFLAGS_save
 
 dnl check for eXosip2 libs
 LDFLAGS_save=$LDFLAGS
-LDFLAGS="$OSIP_LIBS $LDFLAGS"
+LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS"
 LIBS_save=$LIBS
 AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
        [],