Bug-fix for infix function definitions (parse/rename)

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 139a262..ebe182d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1079,18 +1079,30 @@ AC_SUBST([GhcHasReadline], [`echo $fp_cv_ghc_has_readline | sed 'y/yesno/YESNO/'
 AC_DEFUN([FP_GCC_NEEDS_NO_OMIT_LFPTR],
 [AC_REQUIRE([FP_HAVE_GCC])
 AC_CACHE_CHECK([whether gcc needs -mno-omit-leaf-frame-pointer], [fp_cv_gcc_needs_no_omit_lfptr],
-[FP_COMPARE_VERSIONS([$gcc_version_str], [-ge], [3.2],
+[FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.2],
   [fp_cv_gcc_needs_no_omit_lfptr=yes],
   [fp_cv_gcc_needs_no_omit_lfptr=no])])
 if test "$fp_cv_gcc_needs_no_omit_lfptr" = "yes"; then
    AC_DEFINE([HAVE_GCC_MNO_OMIT_LFPTR], [1], [Define to 1 if gcc supports -mno-omit-leaf-frame-pointer.])
 fi])# FP_GCC_NEEDS_NO_OMIT_LFPTR
 
+# FP_GCC_HAS_NO_UNIT_AT_A_TIME
+# --------------------------
+AC_DEFUN([FP_GCC_HAS_NO_UNIT_AT_A_TIME],
+[AC_REQUIRE([FP_HAVE_GCC])
+AC_CACHE_CHECK([whether gcc has -fno-unit-at-a-time], [fp_cv_gcc_has_no_unit_at_a_time],
+[FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4],
+  [fp_cv_gcc_has_no_unit_at_a_time=yes],
+  [fp_cv_gcc_has_no_unit_at_a_time=no])])
+if test "$fp_cv_gcc_has_no_unit_at_a_time" = "yes"; then
+   AC_DEFINE([HAVE_GCC_HAS_NO_UNIT_AT_A_TIME], [1], [Define to 1 if gcc supports -fno-unit-at-a-time.])
+fi])
 
 # FP_SETUP_PROJECT_VERSION
 # ---------------------
 AC_DEFUN([FP_SETUP_PROJECT_VERSION],
 [# Some renamings
+AC_SUBST([ProjectName], [$PACKAGE_NAME])
 AC_SUBST([ProjectVersion], [$PACKAGE_VERSION])
 
 # Split PACKAGE_VERSION into (possibly empty) parts
@@ -1114,6 +1126,6 @@ test -z "$ProjectPatchLevel" && ProjectPatchLevel=0
 ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'`
 
 AC_SUBST([ProjectPatchLevel])
-])# FP_SETUP_PROJECT_INFO
+])# FP_SETUP_PROJECT_VERSION
 
 # LocalWords:  fi