diff --git a/Makefile.am b/Makefile.am index 3d533352f..f1db50ab0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,9 +62,6 @@ PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle EXTRA_DIST = config.rpath BUGS linphone.kdevelop \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ README.arm \ README.mingw \ README.macos \ @@ -75,7 +72,7 @@ EXTRA_DIST = config.rpath BUGS linphone.kdevelop \ $(LINPHONEDEPS_FILELIST) \ $(ISS_SCRIPT).in -DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST) +DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST) CLEANFILES=Portfile Portfile-devel diff --git a/configure.ac b/configure.ac index fbb99d282..b5d2f8679 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ fi dnl Add the languages which your application supports here. PKG_PROG_PKG_CONFIG -ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru zh_CN" +ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb_NO" AC_SUBST(ALL_LINGUAS) AC_DEFINE_UNQUOTED(LINPHONE_ALL_LANGS, "$ALL_LINGUAS", [All supported languages]) @@ -239,7 +239,9 @@ fi if test "$relativeprefix" = "auto" ; then case $target_os in *darwin*) - relativeprefix=yes + if test "$enable_x11" = "false" ; then + relativeprefix=yes + fi ;; *mingw*) relativeprefix=yes diff --git a/coreapi/help/doxygen.dox b/coreapi/help/doxygen.dox index 8217eaf6b..99293c65b 100644 --- a/coreapi/help/doxygen.dox +++ b/coreapi/help/doxygen.dox @@ -205,7 +205,7 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre * @ingroup port *
Multitasking -
liblinphone for IOS natively supports multitasking assuming application follows multitasking guides provided by Apple. First step is to declare application as multitasked. It means adding background mode for both audio and voip to Info.plist file. +
Liblinphone for IOS natively supports multitasking assuming application follows multitasking guides provided by Apple. First step is to declare application as multitasked. It means adding background mode for both audio and voip to Info.plist file.
\code UIBackgroundModes @@ -216,9 +216,9 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre \endcode