diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-08 09:29:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-02-08 09:59:28 +0100 |
| commit | 42efa323ca7933f894a740765fd080ffe4c207c3 (patch) | |
| tree | c8b0cb50f45289511d9edc333e5a2bcd716f1e5d | |
| parent | 02320cb0e2728bb18e013e3ee22351293f3dd64e (diff) | |
| download | samba-42efa323ca7933f894a740765fd080ffe4c207c3.tar.gz samba-42efa323ca7933f894a740765fd080ffe4c207c3.tar.bz2 samba-42efa323ca7933f894a740765fd080ffe4c207c3.zip | |
s4:heimdal_build: allow flex-2.5.35:bison-2.4.1 to regenerate files
metze
| -rw-r--r-- | source4/heimdal_build/internal.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 index a360c6eca1..433394f1af 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) |