[Commits] [SCM] claws branch, master, updated. 3.9.0-208-gfb56fc5

miras at claws-mail.org miras at claws-mail.org
Thu May 2 20:03:27 CEST 2013


The branch master of project "claws" (Claws Mail) has been updated
       via  fb56fc5bfc914dadadacf60b92068f1b25601d78 (commit)
       via  5809e36f182272cfbcf742b6a11e75d9ddc2c997 (commit)
      from  11a24a7c91330db7f63ae98a08623de4f136558a (commit)


- Log -----------------------------------------------------------------
commit fb56fc5bfc914dadadacf60b92068f1b25601d78
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu May 2 20:01:20 2013 +0200

    Add proper test for an installed version of git. Bail if git is not
    found on path.

diff --git a/configure.ac b/configure.ac
index 12430e9..ab78d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,11 @@ BINARY_AGE=0
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
+AC_CHECK_PROG([GIT], [git], [yes], [no], [$PATH])
+if test \( "$GIT" = "no" \); then
+    AC_MSG_ERROR([*** git not found. See http://git-scm.com/])
+fi
+
 if test \( -d .git \); then
     GIT_VERSION=`git describe --abbrev=6 --dirty --always`
 else

commit 5809e36f182272cfbcf742b6a11e75d9ddc2c997
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu May 2 20:00:17 2013 +0200

    Fix references to claws CVS so they now references claws git

diff --git a/autogen.sh b/autogen.sh
index 33d10c5..e4a95f0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -51,7 +51,7 @@ fi
 bisonver=`bison --version`
 
 if [ "$bisonver" = "" ]; then
-	echo Bison is needed to compile Claws Mail CVS
+	echo Bison is needed to compile Claws Mail git
 	exit 1
 fi
 
@@ -62,14 +62,14 @@ else
 fi
 
 if [ "$flexver" = "" ]; then
-	echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+	echo Flex 2.5.31 or greater is needed to compile Claws Mail git
 	exit 1
 else
 	flex_major=`echo $flexver|sed "s/\..*//"`
 	flex_minor=`echo $flexver|sed "s/$flex_major\.\(.*\)\..*/\1/"`
 	flex_micro=`echo $flexver|sed "s/$flex_major\.$flex_minor\.\(.*\)/\1/"`
 	if [ $flex_major -lt 2 -o $flex_minor -lt 5 -o $flex_micro -lt 31 ]; then
-		echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+		echo Flex 2.5.31 or greater is needed to compile Claws Mail git
 		exit 1
 	fi
 fi

-----------------------------------------------------------------------

Summary of changes:
 autogen.sh   |    6 +++---
 configure.ac |    5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list