From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 13 Oct 2011 09:50:51 +0000 (+0200)
Subject: install pem file for mac os x and windows.
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=3a5a469768d6b7206c5e55dfc65738d21c571821

install pem file for mac os x and windows.
---

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 27f9339b..56bd7c62 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -37,6 +37,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /*#define UNSTANDART_GSM_11K 1*/
 
+#define ROOT_CA_FILE PACKAGE_DATA_DIR "/linphone/rootca.pem"
+
 static const char *liblinphone_version=LIBLINPHONE_VERSION;
 static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime);
 static void linphone_core_run_hooks(LinphoneCore *lc);
@@ -514,10 +516,10 @@ static void sip_config_read(LinphoneCore *lc)
 		ms_free(contact);
 	}
 
-#ifdef HAVE_GTK_OSX
-	sal_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/opt/local/share/linphone/rootca.pem"));
-#else
+#ifdef __linux
 	sal_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", "/etc/ssl/certs"));
+#else
+	sal_root_ca(lc->sal, lp_config_get_string(lc->config,"sip","root_ca", ROOT_CA_FILE));
 #endif
 
 	tmp=lp_config_get_int(lc->config,"sip","guess_hostname",1);
diff --git a/share/Makefile.am b/share/Makefile.am
index a96607b7..2f551f53 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -29,8 +29,13 @@ linphone_fd_DATA= linphone.desktop
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=linphone.pc
 
+linphonedir=$(datadir)/linphone
+linphone_DATA=rootca.pem
+
 EXTRA_DIST = 					$(LINPHONE_SOUNDS) \
 								$(LINPHONE_RINGS) \
 						        linphone.desktop.in   \
 								linphone.pc.in \
-								Makefile.inc
+								Makefile.inc \
+								rootca.pem
+