Commit 31c895b5 authored by Simon Morlat's avatar Simon Morlat

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

parent 574ed8e5
...@@ -747,7 +747,7 @@ linphonec_init(int argc, char **argv) ...@@ -747,7 +747,7 @@ linphonec_init(int argc, char **argv)
linphone_core_enable_video_display(linphonec, display_enabled); linphone_core_enable_video_display(linphonec, display_enabled);
if (display_enabled && window_id != 0) 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); linphone_core_set_native_video_window_id(linphonec,window_id);
} }
......
...@@ -8,9 +8,8 @@ GITREVISION=`cd $(top_srcdir) && git rev-parse HEAD` ...@@ -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. ## 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, ## We can't only depend on the presence of the .git/ directory anymore,
## because of gits submodule handling. ## because of gits submodule handling.
## We now simply issue a git status and if there's an error, the $(GITSTATUS) ## 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.
## variable won't contain "GITOK" GITLOG=$(shell git log -1 $(top_srcdir)/configure.ac)
GITSTATUS=`cd $(top_srcdir) && git status > /dev/null && echo GITOK`
ECHO=/bin/echo ECHO=/bin/echo
...@@ -168,7 +167,7 @@ AM_CXXFLAGS=$(AM_CFLAGS) ...@@ -168,7 +167,7 @@ AM_CXXFLAGS=$(AM_CFLAGS)
#the PACKAGE_VERSION given in configure.ac #the PACKAGE_VERSION given in configure.ac
make_gitversion_h: make_gitversion_h:
if test "$(GITSTATUS)" == "GITOK" ; then \ if test -n "$(GITLOG)" ; then \
if test "$(GITDESCRIBE)" != "" ; then \ if test "$(GITDESCRIBE)" != "" ; then \
if test "$(GIT_TAG)" != "$(PACKAGE_VERSION)" ; then \ if test "$(GIT_TAG)" != "$(PACKAGE_VERSION)" ; then \
echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \ echo "*** PACKAGE_VERSION and git tag differ. Please put them identical."; \
......
mediastreamer2 @ 932964c5
Subproject commit 70a029a00f2b7272d8c790557e71ff8b73004b85 Subproject commit 932964c57f0fc8d7690334dae59ab70b455bf466
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment