install pem file for mac os x and windows.

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 27f9339b9a43874161f3a075ce74f7fd71906f98..56bd7c62ad14ef8651bdb5a83054229dd2cd2fc2 100644 (file)
--- 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 a96607b711a00ae4d186eb156f72bbcaa7a3c777..2f551f53d4c371ecdd18d13ce851c37b508c3543 100644 (file)
--- 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
+