| ... |
... |
@@ -13,8 +13,7 @@ AC_DEFUN([FPTOOLS_HAPPY], |
|
13
|
13
|
AC_SUBST(HappyCmd,$HAPPY)
|
|
14
|
14
|
AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
|
|
15
|
15
|
changequote(, )dnl
|
|
16
|
|
-[
|
|
17
|
|
-if test x"$HappyCmd" != x; then
|
|
|
16
|
+[if test x"$HappyCmd" != x; then
|
|
18
|
17
|
fptools_cv_happy_version=`"$HappyCmd" -v |
|
|
19
|
18
|
grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'` ;
|
|
20
|
19
|
else
|
| ... |
... |
@@ -24,7 +23,12 @@ changequote([, ])dnl |
|
24
|
23
|
])
|
|
25
|
24
|
if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs
|
|
26
|
25
|
then
|
|
27
|
|
- failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC"
|
|
|
26
|
+ if test x"$fptools_cv_happy_version" != x; then
|
|
|
27
|
+ fptools_cv_happy_version_display="version $fptools_cv_happy_version";
|
|
|
28
|
+ else
|
|
|
29
|
+ fptools_cv_happy_version_display="none";
|
|
|
30
|
+ fi;
|
|
|
31
|
+ failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC. (Found: $fptools_cv_happy_version_display)"
|
|
28
|
32
|
FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0],
|
|
29
|
33
|
[AC_MSG_ERROR([$failure_msg])])[]
|
|
30
|
34
|
FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0],
|
| ... |
... |
@@ -32,7 +36,6 @@ then |
|
32
|
36
|
[AC_MSG_ERROR([$failure_msg])])[])[]
|
|
33
|
37
|
FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0],
|
|
34
|
38
|
[AC_MSG_ERROR([$failure_msg])])[]
|
|
35
|
|
-
|
|
36
|
39
|
fi
|
|
37
|
40
|
HappyVersion=$fptools_cv_happy_version;
|
|
38
|
41
|
AC_SUBST(HappyVersion)
|