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-03-09 13:28:08 by panne]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
08e2f18
..
46dc3d1
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-541,36
+541,40
@@
FPTOOLS_C_LONG_LONG
dnl ** what are the sizes of various types
dnl (these must come before GHC_CHECK_ALIGNMENT)
AC_CHECK_SIZEOF(char, 1)
dnl ** what are the sizes of various types
dnl (these must come before GHC_CHECK_ALIGNMENT)
AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(unsigned char, 1)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(unsigned short, 2)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(float, 4)
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(unsigned int, 4)
AC_CHECK_SIZEOF(long, 4)
AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(unsigned long, 4)
if test "$fptools_cv_have_long_long" = yes; then
AC_CHECK_SIZEOF(long long, 8)
if test "$fptools_cv_have_long_long" = yes; then
AC_CHECK_SIZEOF(long long, 8)
+fi
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(unsigned char, 1)
+AC_CHECK_SIZEOF(unsigned int, 4)
+AC_CHECK_SIZEOF(unsigned long, 4)
+if test "$fptools_cv_have_long_long" = yes; then
AC_CHECK_SIZEOF(unsigned long long, 8)
fi
AC_CHECK_SIZEOF(unsigned long long, 8)
fi
-AC_CHECK_SIZEOF(float, 4)
-AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(unsigned short, 2)
AC_CHECK_SIZEOF(void *, 4)
dnl ** what are alignment constraints on various types
FPTOOLS_CHECK_ALIGNMENT(char)
AC_CHECK_SIZEOF(void *, 4)
dnl ** what are alignment constraints on various types
FPTOOLS_CHECK_ALIGNMENT(char)
-FPTOOLS_CHECK_ALIGNMENT(unsigned char)
-FPTOOLS_CHECK_ALIGNMENT(short)
-FPTOOLS_CHECK_ALIGNMENT(unsigned short)
+FPTOOLS_CHECK_ALIGNMENT(double)
+FPTOOLS_CHECK_ALIGNMENT(float)
FPTOOLS_CHECK_ALIGNMENT(int)
FPTOOLS_CHECK_ALIGNMENT(int)
-FPTOOLS_CHECK_ALIGNMENT(unsigned int)
FPTOOLS_CHECK_ALIGNMENT(long)
FPTOOLS_CHECK_ALIGNMENT(long)
-FPTOOLS_CHECK_ALIGNMENT(unsigned long)
if test "$fptools_cv_have_long_long" = yes; then
FPTOOLS_CHECK_ALIGNMENT(long long)
if test "$fptools_cv_have_long_long" = yes; then
FPTOOLS_CHECK_ALIGNMENT(long long)
+fi
+FPTOOLS_CHECK_ALIGNMENT(short)
+FPTOOLS_CHECK_ALIGNMENT(unsigned char)
+FPTOOLS_CHECK_ALIGNMENT(unsigned int)
+FPTOOLS_CHECK_ALIGNMENT(unsigned long)
+if test "$fptools_cv_have_long_long" = yes; then
FPTOOLS_CHECK_ALIGNMENT(unsigned long long)
fi
FPTOOLS_CHECK_ALIGNMENT(unsigned long long)
fi
-FPTOOLS_CHECK_ALIGNMENT(float)
-FPTOOLS_CHECK_ALIGNMENT(double)
+FPTOOLS_CHECK_ALIGNMENT(unsigned short)
FPTOOLS_CHECK_ALIGNMENT(void *)
dnl ** can we open files in binary mode?
FPTOOLS_CHECK_ALIGNMENT(void *)
dnl ** can we open files in binary mode?
@@
-664,6
+668,10
@@
AC_CHECK_LIB(iberty, xmalloc)
AC_CHECK_LIB(bfd, bfd_init)
dnl ** check for readline, for Hugs
AC_CHECK_LIB(bfd, bfd_init)
dnl ** check for readline, for Hugs
+dnl termcap is obsoleted by ncurses, but for compatibility, we have to
+dnl check for both...
+AC_SEARCH_LIBS(tputs, [ncurses termcap])
+
AC_CHECK_LIB(readline, readline,
[
AC_DEFINE(HAVE_LIBREADLINE,1)
AC_CHECK_LIB(readline, readline,
[
AC_DEFINE(HAVE_LIBREADLINE,1)
@@
-672,8
+680,7
@@
HaveLibReadline=YES
[
AC_DEFINE(HAVE_LIBREADLINE,0)
HaveLibReadline=NO
[
AC_DEFINE(HAVE_LIBREADLINE,0)
HaveLibReadline=NO
-],
--ltermcap)
+])
AC_SUBST(HaveLibReadline)
AC_SUBST(HaveLibReadline)