witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

really check that we are in a linphone git repo before taking the "git describe".

Browse source
This commit is contained in:
Simon Morlat 2014-08-06 11:22:46 +02:00
parent 574ed8e52b
commit 31c895b521
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
console/linphonec.c
View file

@ -747,7 +747,7 @@ linphonec_init(int argc, char **argv)
linphone_core_enable_video_display(linphonec, display_enabled);
if (display_enabled && window_id != 0)
{
printf ("Setting window_id: 0x%x\n", window_id);
printf("Setting window_id: 0x%x\n", window_id);
linphone_core_set_native_video_window_id(linphonec,window_id);
}

7
coreapi/Makefile.am
View file

@ -8,9 +8,8 @@ GITREVISION=`cd $(top_srcdir) && git rev-parse HEAD`
## This command is used to check if the sources are cloned in a git repo.
## We can't only depend on the presence of the .git/ directory anymore,
## because of gits submodule handling.
## We now simply issue a git status and if there's an error, the $(GITSTATUS)
## variable won't contain "GITOK"
GITSTATUS=`cd $(top_srcdir) && git status > /dev/null && echo GITOK`
## We now simply issue a git log on configure.ac and if the output is empty (error or file not tracked), then we are not in git.
GITLOG=$(shell git log -1 $(top_srcdir)/configure.ac)
ECHO=/bin/echo
@ -168,7 +167,7 @@ AM_CXXFLAGS=$(AM_CFLAGS)
#the PACKAGE_VERSION given in configure.ac
make_gitversion_h:
if test "$(GITSTATUS)" == "GITOK" ; then \
if test -n "$(GITLOG)" ; then \
if test "$(GITDESCRIBE)" != "" ; then \
if test "$(GIT_TAG)" != "$(PACKAGE_VERSION)" ; then \
echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \

2
mediastreamer2

@ -1 +1 @@
Subproject commit 70a029a00f2b7272d8c790557e71ff8b73004b85
Subproject commit 932964c57f0fc8d7690334dae59ab70b455bf466