gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-9-gffb9395)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ffb9395d8d138de4b7b1d92f44cfc06a494077d3 (commit)
      from  77b5bd3b9b49d907492aa3b20e3362f3fc4f6209 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 Makefile.am            |    2 +-
 m4/geda-git-version.m4 |    6 +++---
 m4/geda-git.m4         |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)


=================
 Commit Messages
=================

commit ffb9395d8d138de4b7b1d92f44cfc06a494077d3
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Don't use `--always' argument to `git describe'.
    
    Fixes build with older versions of git.
    
    Closes-bug: lp-702887

:100644 100644 316d6f2... 35e07e2... M	Makefile.am
:100644 100644 bdf3a1e... 05ca6b7... M	m4/geda-git-version.m4
:100644 100644 4b04349... b5f1398... M	m4/geda-git.m4

=========
 Changes
=========

commit ffb9395d8d138de4b7b1d92f44cfc06a494077d3
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Don't use `--always' argument to `git describe'.
    
    Fixes build with older versions of git.
    
    Closes-bug: lp-702887

diff --git a/Makefile.am b/Makefile.am
index 316d6f2..35e07e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ version.h: stamp-git $(top_builddir)/configure $(srcdir)/version.h.in
 
 	@date_ver=$(DATE_VERSION); dotted_ver=$(DOTTED_VERSION); \
 	git_commit=`cd $(srcdir) && $(GIT) rev-parse HEAD`; \
-	git_ver=`cd $(srcdir) && $(GIT) describe --always HEAD`; \
+	git_ver=`cd $(srcdir) && $(GIT) describe HEAD`; \
 	sed -e"s:^.*\(PACKAGE_DATE_VERSION\).*$$:#define \1 \"$$date_ver\":" \
 	    -e"s:^.*\(PACKAGE_DOTTED_VERSION\).*$$:#define \1 \"$$dotted_ver\":" \
 	    -e"s:^.*\(PACKAGE_GIT_VERSION\).*$$:#define \1 \"$$git_ver\":" \
diff --git a/m4/geda-git-version.m4 b/m4/geda-git-version.m4
index bdf3a1e..05ca6b7 100644
--- a/m4/geda-git-version.m4
+++ b/m4/geda-git-version.m4
@@ -1,8 +1,8 @@
 # geda-git-version.m4                                   -*-Autoconf-*-
-# serial 1.0
+# serial 2
 
 dnl Extract gEDA version parameters from a git repository, if present.
-dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl Copyright (C) 2009-2011  Peter Brett <peter@xxxxxxxxxxxxx>
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ changequote([,])
   # describe.
   if test "X$HAVE_GIT_REPO" = "Xyes"; then
     AC_MSG_CHECKING([version from git repository])
-    GIT_VERSION=`cd $srcdir && $GIT describe --always`
+    GIT_VERSION=`cd $srcdir && $GIT describe`
     AC_MSG_RESULT([$GIT_VERSION])
   fi
 
diff --git a/m4/geda-git.m4 b/m4/geda-git.m4
index 4b04349..b5f1398 100644
--- a/m4/geda-git.m4
+++ b/m4/geda-git.m4
@@ -1,8 +1,8 @@
 # geda-git.m4                                           -*-Autoconf-*-
-# serial 1.0
+# serial 2
 
 dnl Generic checks relating to git tools & repositories
-dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl Copyright (C) 2009-2011  Peter Brett <peter@xxxxxxxxxxxxx>
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ AC_DEFUN([AX_GIT_REPO],
   HAVE_GIT_REPO=no
   if test "X$GIT" != "Xno"; then
     AC_MSG_CHECKING([if the source directory is a git repository])
-    if (cd $srcdir && $GIT describe --always > /dev/null); then
+    if (cd $srcdir && $GIT rev-parse --git-dir > /dev/null 2>&1); then
       AC_MSG_RESULT([yes])
       HAVE_GIT_REPO=yes
     else




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs