diff --git a/Tools/check_tools.sh b/Tools/check_tools.sh index 488893400..1830483a8 100755 --- a/Tools/check_tools.sh +++ b/Tools/check_tools.sh @@ -36,7 +36,7 @@ fi # just ensure that JDK is installed - if not, it will display user a popup if ! java -version &>/dev/null; then - echo_err "Please install Java" + echo_err "Please install Java JDK (not just JRE)" fi # needed by x264 diff --git a/submodules/belle-sip b/submodules/belle-sip index 7fe6d9d38..8d2ec56cd 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7fe6d9d38f9abc6adc7139341a3819026d5400a4 +Subproject commit 8d2ec56cd0934111fdd614e2e1677f19bdd448a2 diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 5739db9d3..01c8f6cdf 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -28,7 +28,6 @@ linphone_configure_controls = \ --with-readline=none \ --enable-gtk_ui=no \ --enable-console_ui=no \ - --enable-bellesip \ --with-gsm=$(prefix) \ --with-srtp=$(prefix) \ --with-antlr=$(prefix) \ @@ -40,7 +39,6 @@ linphone_configure_controls = \ --disable-tutorials \ --disable-tools \ --enable-msg-storage=yes \ - --enable-ios \ --with-polarssl=$(prefix) \ --enable-dtls diff --git a/submodules/linphone b/submodules/linphone index d1f21907e..ee33c10a6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d1f21907e7863171c155690ec0a76f5903f52b6b +Subproject commit ee33c10a6826476c8a37fb20990c262a8aece799