diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-22 22:49:28 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-22 22:49:28 +0100 |
| commit | 3549fd152f64b6846b3339ce63665e0873ed0f3c (patch) | |
| tree | 2c91f2440073ecd8fea77e373640ae4ff3317979 | |
| parent | e75227feacf1434a342c8a7e6ec3619dc6771c39 (diff) | |
| download | haskell-3549fd152f64b6846b3339ce63665e0873ed0f3c.tar.gz | |
Rename FP_HAVE_GCC to FP_GCC_VERSION
| -rw-r--r-- | aclocal.m4 | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | distrib/configure.ac.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 4b6e85529d..4b73109942 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -691,11 +691,11 @@ rm -f conftest ])]) -# FP_HAVE_GCC +# FP_GCC_VERSION # ----------- # Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the # output variable GccVersion. -AC_DEFUN([FP_HAVE_GCC], +AC_DEFUN([FP_GCC_VERSION], [AC_REQUIRE([AC_PROG_CC]) if test -z "$GCC" then @@ -714,7 +714,7 @@ AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version], ]) AC_SUBST([GccVersion], [$fp_cv_gcc_version]) AC_SUBST(GccLT34) -])# FP_HAVE_GCC +])# FP_GCC_VERSION dnl Small feature test for perl version. Assumes PerlCmd dnl contains path to perl binary. @@ -1086,7 +1086,7 @@ AC_SUBST([GhcPkgCmd]) # integer wrap around. (Trac #952) # AC_DEFUN([FP_GCC_EXTRA_FLAGS], -[AC_REQUIRE([FP_HAVE_GCC]) +[AC_REQUIRE([FP_GCC_VERSION]) AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts], [fp_cv_gcc_extra_opts= FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4], diff --git a/configure.ac b/configure.ac index 2eb7f29d37..89e966d57c 100644 --- a/configure.ac +++ b/configure.ac @@ -537,7 +537,7 @@ dnl ** look for GCC and find out which version dnl Figure out which C compiler to use. Gcc is preferred. dnl If gcc, make sure it's at least 2.1 dnl -FP_HAVE_GCC +FP_GCC_VERSION FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_GCC_LINKER_OPTS_STAGE0],[CONF_LD_LINKER_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index e54839f0d5..7df0f3b52b 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -55,7 +55,7 @@ export CC WhatGccIsCalled="$CC" AC_SUBST(WhatGccIsCalled) -FP_HAVE_GCC +FP_GCC_VERSION AC_PROG_CPP # |