submodules: update bunch of them

ringmail · Jun 22, 2016 · 43eade8 · 43eade8
1 parent d87354a
commit 43eade8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/prepare.py b/prepare.py
@@ -185,6 +185,7 @@ def check_environment(self):
         if find_executable("nasm"):
             nasm_output = Popen("nasm -f elf32".split(" "), stderr=PIPE, stdout=PIPE).stderr.read()
             if "fatal: unrecognised output format" in nasm_output:
+                error("Invalid version of nasm detected. Please make sure that you are NOT using Apple's binary here")
                 self.missing_dependencies["nasm"] = "nasm"
                 reterr = 1
 

diff --git a/submodules/bctoolbox b/submodules/bctoolbox
diff --git a/submodules/belle-sip b/submodules/belle-sip
diff --git a/submodules/bzrtp b/submodules/bzrtp
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
diff --git a/submodules/linphone b/submodules/linphone