projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-07-25 15:20:10 by simonmar]
[ghc-hetmet.git]
/
aclocal.m4
diff --git
a/aclocal.m4
b/aclocal.m4
index
ea2e92e
..
9207a50
100644
(file)
--- a/
aclocal.m4
+++ b/
aclocal.m4
@@
-1,4
+1,4
@@
-dnl $Id: aclocal.m4,v 1.53 2000/07/11 10:47:06 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.55 2000/07/13 09:17:57 michaelw Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
@@
-350,14
+350,13
@@
fi
rm -fr conftest*
])
rm -fr conftest*
])
-dnl Test for version of installed ghc. Uses $GHC. Largely pinched from c2hs.
dnl
dnl
-dnl
-dnl FPTOOLS_GHC_VERSION
dnl FPTOOLS_GHC_VERSION(version)
dnl FPTOOLS_GHC_VERSION(major, minor [, patchlevel])
dnl FPTOOLS_GHC_VERSION(version)
dnl FPTOOLS_GHC_VERSION(major, minor [, patchlevel])
+dnl FPTOOLS_GHC_VERSION(version, major, minor, patchlevel)
dnl
dnl Test for version of installed ghc. Uses $GHC.
dnl
dnl Test for version of installed ghc. Uses $GHC.
+dnl [original version pinched from c2hs]
dnl
AC_DEFUN(FPTOOLS_GHC_VERSION,
[define([FPTOOLS_CV_GHC_VERSION], [fptools_cv_ghc_version])dnl
dnl
AC_DEFUN(FPTOOLS_GHC_VERSION,
[define([FPTOOLS_CV_GHC_VERSION], [fptools_cv_ghc_version])dnl
@@
-366,7
+365,7
@@
${GHC-ghc} --version > conftestghc 2>&1
cat conftestghc >&AC_FD_CC
dnl `Useless Use Of cat' award...
changequote(<<, >>)dnl
cat conftestghc >&AC_FD_CC
dnl `Useless Use Of cat' award...
changequote(<<, >>)dnl
- FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/.* version \([0-9.]\+\(, patchlevel [0-9]\+\)\?\)/\1/;t PL;b;:PL s/, patchlevel */./;p'`
+ FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.]\+\).*/\1/p'`
changequote([, ])dnl
rm -fr conftest*
if test "[$]FPTOOLS_CV_GHC_VERSION" = ""
changequote([, ])dnl
rm -fr conftest*
if test "[$]FPTOOLS_CV_GHC_VERSION" = ""
@@
-399,8
+398,8
@@
ifelse($#, [1], [dnl
[$2]="[$]FPTOOLS_CV_GHC_VERSION[_major]"
[$3]="[$]FPTOOLS_CV_GHC_VERSION[_minor]"
[$4]="[$]FPTOOLS_CV_GHC_VERSION[_pl]"
[$2]="[$]FPTOOLS_CV_GHC_VERSION[_major]"
[$3]="[$]FPTOOLS_CV_GHC_VERSION[_minor]"
[$4]="[$]FPTOOLS_CV_GHC_VERSION[_pl]"
-], [AC_MSG_ERROR([wrong number of arguments to $0])])dnl
-undefine(FPTOOLS_CV_GHC_VERSION)dnl
+], [AC_MSG_ERROR([wrong number of arguments to [$0]])])dnl
+undefine([FPTOOLS_CV_GHC_VERSION])dnl
])dnl
])dnl