From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 8 Feb 2010 08:29:22 +0000 (+0100)
Subject: s4:heimdal_build: allow flex-2.5.35:bison-2.4.1 to regenerate files
X-Git-Tag: samba-3.6.0pre1~5532
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42efa323ca7933f894a740765fd080ffe4c207c3;p=thirdparty%2Fsamba.git

s4:heimdal_build: allow flex-2.5.35:bison-2.4.1 to regenerate files

metze
---

diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index a360c6eca1c..433394f1af0 100644
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -218,6 +218,7 @@ LEX_YACC_COMBINATIONS=""
 LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3"
 LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.34:bison-2.3"
 LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.3"
+LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.35:bison-2.4.1"
 
 AC_PROG_LEX
 LEX_BASENAME=`basename "$LEX"`
@@ -237,13 +238,20 @@ AC_PROG_YACC
 YACC_BASENAME=`basename "$YACC"`
 if test x"$YACC_BASENAME" = x"bison -y"; then
 	# bison (GNU Bison) 2.3
+	# or
+	# bison (GNU Bison) 2.4.1
 	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
 	AC_MSG_CHECKING(bison version)
 	AC_MSG_RESULT($BISON_VERSION)
 	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
 	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
+	BISON_RELEASE=`echo $BISON_VERSION | cut -d '.' -f3`
 
-	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
+	if test x"$BISON_RELEASE" != x""; then
+		YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR.$BISON_RELEASE"
+	else
+		YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
+	fi
 fi
 
 AC_MSG_CHECKING(working LEX YACC combination)