talons

commit a66c23334c5c9b2cac26bdf39fd9544950f91006
parent a18f49eebf9ed1ee7392f3e00701c079819c5f1f
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 10 Oct 2012 08:04:50 +0000

2012-10-10 [colin]	3.8.1cvs89

	* autogen.sh
		Fix bug #2638, "Respect $LEX environment variable in autogen.sh"

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
autogen.sh
 | 
6
+++++-
M
configure.ac
 | 
2
+-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-10 [colin]	3.8.1cvs89
+
+	* autogen.sh
+		Fix bug #2638, "Respect $LEX environment variable in autogen.sh"
+
 2012-10-10 [colin]	3.8.1cvs88
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4463,3 +4463,4 @@
 ( cvs diff -u -r 1.396.2.3641 -r 1.396.2.3642 ChangeLog;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 doc/man/claws-mail.1;  cvs diff -u -r 1.382.2.613 -r 1.382.2.614 src/compose.c;  cvs diff -u -r 1.36.2.201 -r 1.36.2.202 src/common/utils.c;  ) > 3.8.1cvs86.patchset
 ( cvs diff -u -r 1.36.2.202 -r 1.36.2.203 src/common/utils.c;  ) > 3.8.1cvs87.patchset
 ( cvs diff -u -r 1.382.2.614 -r 1.382.2.615 src/compose.c;  ) > 3.8.1cvs88.patchset
+( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 autogen.sh;  ) > 3.8.1cvs89.patchset
diff --git a/autogen.sh b/autogen.sh
@@ -55,7 +55,11 @@ if [ "$bisonver" = "" ]; then
 	exit 1
 fi
 
-flexver=`flex --version|sed "s/.* //"`
+if [ "$LEX" != "" ]; then
+	flexver=`$LEX --version|sed "s/.* //"`
+else
+	flexver=`flex --version|sed "s/.* //"`
+fi
 
 if [ "$flexver" = "" ]; then
 	echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=88
+EXTRA_VERSION=89
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=