From cc45df4858dec37c9c9c733bfedc83b825b85e5e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 17:12:01 +0200 Subject: [PATCH] Fix compilation for iOS. --- configure.ac | 10 +++++++++- share/Makefile.am | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5bbb5f645..b90833310 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,14 @@ AC_SUBST(ACLOCAL_MACOS_FLAGS) AC_SUBST(CONSOLE_FLAGS) AC_SUBST(GUI_FLAGS) +case $host in + *-apple-darwin*) + HTTPS_CA_DIR=`openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/"` + ;; +esac + +AC_SUBST(HTTPS_CA_DIR) + dnl localization tools IT_PROG_INTLTOOL([0.40], [no-xml]) @@ -742,7 +750,7 @@ AC_SUBST(ORTP_LIBS) AC_SUBST([ORTP_VERSION]) AC_SUBST([ORTP_DIR]) -AC_ARG_ENABLE(tests_enabled, +AC_ARG_ENABLE(tests, [AS_HELP_STRING([--disable-tests], [Disable compilation of tests])], [case "${enableval}" in yes) tests_enabled=true ;; diff --git a/share/Makefile.am b/share/Makefile.am index 6f8fe9198..391bc7053 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -32,7 +32,7 @@ pkgconfig_DATA=linphone.pc linphonedir=$(datadir)/linphone linphone_DATA=rootca.pem rootca.pem: - $(top_srcdir)/scripts/mk-ca-bundle.pl rootca.pem + HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(top_srcdir)/scripts/mk-ca-bundle.pl rootca.pem EXTRA_DIST = $(LINPHONE_SOUNDS) \ $(LINPHONE_RINGS) \