diff options
author | Ben Gamari <ben@smart-cactus.org> | 2020-08-24 17:04:55 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-05 14:51:27 -0400 |
commit | 67059893a232e682aa5eca7a3d13042b1c884d55 (patch) | |
tree | 453e502de1f9bf4a77b65fd371dd340fdc0fe8cf /aclocal.m4 | |
parent | 7980ae23696f2406c65ee498155b26c09d3d4394 (diff) | |
download | haskell-67059893a232e682aa5eca7a3d13042b1c884d55.tar.gz |
configure: Fix whitespace
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index b1f52cb7e1..09a122c296 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1627,37 +1627,37 @@ AC_SUBST([GccExtraViaCOpts],$fp_cv_gcc_extra_opts) # --------------------- AC_DEFUN([FP_SETUP_PROJECT_VERSION], [ -if test "$RELEASE" = "NO"; then - AC_MSG_CHECKING([for GHC version date]) - if test -f VERSION_DATE; then - PACKAGE_VERSION=${PACKAGE_VERSION}.`cat VERSION_DATE` - AC_MSG_RESULT(given $PACKAGE_VERSION) - elif test -e .git; then - changequote(, )dnl - ver_posixtime=`git log -1 --pretty=format:%ct` - ver_date=`perl -MPOSIX -e "print strftime('%Y%m%d', gmtime($ver_posixtime));"` - if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else - changequote([, ])dnl - AC_MSG_ERROR([failed to detect version date: check that git and perl are in your path]) + if test "$RELEASE" = "NO"; then + AC_MSG_CHECKING([for GHC version date]) + if test -f VERSION_DATE; then + PACKAGE_VERSION=${PACKAGE_VERSION}.`cat VERSION_DATE` + AC_MSG_RESULT(given $PACKAGE_VERSION) + elif test -e .git; then + changequote(, )dnl + ver_posixtime=`git log -1 --pretty=format:%ct` + ver_date=`perl -MPOSIX -e "print strftime('%Y%m%d', gmtime($ver_posixtime));"` + if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else + changequote([, ])dnl + AC_MSG_ERROR([failed to detect version date: check that git and perl are in your path]) + fi + PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date + AC_MSG_RESULT(inferred $PACKAGE_VERSION) + elif test -f VERSION; then + PACKAGE_VERSION=`cat VERSION` + AC_MSG_RESULT(given $PACKAGE_VERSION) + else + AC_MSG_WARN([cannot determine snapshot version: no .git directory and no VERSION file]) + dnl We'd really rather this case didn't happen, but it might + dnl do (in particular, people using lndir trees may find that + dnl the build system can't find any other date). If it does + dnl happen, then we use the current date. + dnl This way we get some idea about how recent a build is. + dnl It also means that packages built for 2 different builds + dnl will probably use different version numbers, so things are + dnl less likely to go wrong. + PACKAGE_VERSION=${PACKAGE_VERSION}.`date +%Y%m%d` fi - PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date - AC_MSG_RESULT(inferred $PACKAGE_VERSION) - elif test -f VERSION; then - PACKAGE_VERSION=`cat VERSION` - AC_MSG_RESULT(given $PACKAGE_VERSION) - else - AC_MSG_WARN([cannot determine snapshot version: no .git directory and no VERSION file]) - dnl We'd really rather this case didn't happen, but it might - dnl do (in particular, people using lndir trees may find that - dnl the build system can't find any other date). If it does - dnl happen, then we use the current date. - dnl This way we get some idea about how recent a build is. - dnl It also means that packages built for 2 different builds - dnl will probably use different version numbers, so things are - dnl less likely to go wrong. - PACKAGE_VERSION=${PACKAGE_VERSION}.`date +%Y%m%d` fi -fi AC_MSG_CHECKING([for GHC Git commit id]) if test -e .git; then @@ -1676,54 +1676,54 @@ fi fi -# Some renamings -AC_SUBST([ProjectName], [$PACKAGE_NAME]) -AC_SUBST([ProjectVersion], [$PACKAGE_VERSION]) -AC_SUBST([ProjectGitCommitId], [$PACKAGE_GIT_COMMIT_ID]) + # Some renamings + AC_SUBST([ProjectName], [$PACKAGE_NAME]) + AC_SUBST([ProjectVersion], [$PACKAGE_VERSION]) + AC_SUBST([ProjectGitCommitId], [$PACKAGE_GIT_COMMIT_ID]) -# Split PACKAGE_VERSION into (possibly empty) parts -VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/` -VERSION_TMP=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/` -VERSION_MINOR=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/` -ProjectPatchLevel=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/` + # Split PACKAGE_VERSION into (possibly empty) parts + VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/` + VERSION_TMP=`echo $PACKAGE_VERSION | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/` + VERSION_MINOR=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1'/` + ProjectPatchLevel=`echo $VERSION_TMP | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3'/` -# Calculate project version as an integer, using 2 digits for minor version -case $VERSION_MINOR in - ?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;; - ??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;; - *) AC_MSG_ERROR([bad minor version in $PACKAGE_VERSION]) ;; -esac -AC_SUBST([ProjectVersionInt]) + # Calculate project version as an integer, using 2 digits for minor version + case $VERSION_MINOR in + ?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;; + ??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;; + *) AC_MSG_ERROR([bad minor version in $PACKAGE_VERSION]) ;; + esac + AC_SUBST([ProjectVersionInt]) -# The project patchlevel is zero unless stated otherwise -test -z "$ProjectPatchLevel" && ProjectPatchLevel=0 + # The project patchlevel is zero unless stated otherwise + test -z "$ProjectPatchLevel" && ProjectPatchLevel=0 -# Save split version of ProjectPatchLevel -ProjectPatchLevel1=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1/'` -ProjectPatchLevel2=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3/'` + # Save split version of ProjectPatchLevel + ProjectPatchLevel1=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1/'` + ProjectPatchLevel2=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3/'` -AC_SUBST([ProjectPatchLevel1]) -AC_SUBST([ProjectPatchLevel2]) + AC_SUBST([ProjectPatchLevel1]) + AC_SUBST([ProjectPatchLevel2]) -# Remove dots from the patch level; this allows us to have versions like 6.4.1.20050508 -ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'` + # Remove dots from the patch level; this allows us to have versions like 6.4.1.20050508 + ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'` -AC_SUBST([ProjectPatchLevel]) + AC_SUBST([ProjectPatchLevel]) -# The version of the GHC package changes every day, since the -# patchlevel is the current date. We don't want to force -# recompilation of the entire compiler when this happens, so for -# GHC HEAD we omit the patchlevel from the package version number. -# -# The ProjectPatchLevel1 > 20000000 iff GHC HEAD. If it's for a stable -# release like 7.10.1 or for a release candidate such as 7.10.1.20141224 -# then we don't omit the patchlevel components. + # The version of the GHC package changes every day, since the + # patchlevel is the current date. We don't want to force + # recompilation of the entire compiler when this happens, so for + # GHC HEAD we omit the patchlevel from the package version number. + # + # The ProjectPatchLevel1 > 20000000 iff GHC HEAD. If it's for a stable + # release like 7.10.1 or for a release candidate such as 7.10.1.20141224 + # then we don't omit the patchlevel components. -ProjectVersionMunged="$ProjectVersion" -if test "$ProjectPatchLevel1" -gt 20000000; then - ProjectVersionMunged="${VERSION_MAJOR}.${VERSION_MINOR}" -fi -AC_SUBST([ProjectVersionMunged]) + ProjectVersionMunged="$ProjectVersion" + if test "$ProjectPatchLevel1" -gt 20000000; then + ProjectVersionMunged="${VERSION_MAJOR}.${VERSION_MINOR}" + fi + AC_SUBST([ProjectVersionMunged]) ])# FP_SETUP_PROJECT_VERSION # Check for a working timer_create(). We need a pretty detailed check |