From 31c895b5217cf643dff8d91aaff5bb5b3cbff8f2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 6 Aug 2014 11:22:46 +0200 Subject: [PATCH] really check that we are in a linphone git repo before taking the "git describe". --- console/linphonec.c | 2 +- coreapi/Makefile.am | 7 +++---- mediastreamer2 | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/console/linphonec.c b/console/linphonec.c index b8072e325..ff16e1387 100644 --- a/console/linphonec.c +++ b/console/linphonec.c @@ -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); } diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index 03d42f08d..5b4460c79 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -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."; \ diff --git a/mediastreamer2 b/mediastreamer2 index 70a029a00..932964c57 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 70a029a00f2b7272d8c790557e71ff8b73004b85 +Subproject commit 932964c57f0fc8d7690334dae59ab70b455bf466