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-01-11 14:51:43 by sewardj]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
3569b8e
..
ee1b3c0
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-16,6
+16,12
@@
dnl
# First off, a distrib sanity check..
AC_INIT(mk/config.mk.in)
# First off, a distrib sanity check..
AC_INIT(mk/config.mk.in)
+dnl * Declare subdirectories that have a private configure script
+dnl
+dnl After the toplevel configuration is complete, the script will recurse into
+dnl these subdirectories (the use of cache values makes repeated checks cheap)
+AC_CONFIG_SUBDIRS(ghc)
+
# -------------------------------------------------------------------------
# Prepare to generate the following header files
#
# -------------------------------------------------------------------------
# Prepare to generate the following header files
#
@@
-298,6
+304,10
@@
dnl AC_SUBST(TargetVendor_CPP)
AC_SUBST(exeext)
AC_SUBST(exeext)
+AC_PATH_PROG(GHC,ghc)
+AC_PATH_PROGS(NHC,nhc nhc98)
+AC_PATH_PROG(HBC,hbc)
+
dnl --------------------------------------------------------------
dnl * Project specific configuration options
dnl --------------------------------------------------------------
dnl --------------------------------------------------------------
dnl * Project specific configuration options
dnl --------------------------------------------------------------
@@
-315,7
+325,7
@@
AC_ARG_WITH(hc,
recent version of GHC, but you could always try...)
],
[WithHc="$withval"],
recent version of GHC, but you could always try...)
],
[WithHc="$withval"],
-[WithHc="ghc"]
+[WithHc=$GHC]
)
AC_SUBST(WithHc)
)
AC_SUBST(WithHc)
@@
-474,7
+484,7
@@
dnl ** check for full ANSI header (.h) files
AC_HEADER_STDC
dnl ** check for specific header (.h) files that we are interested in
AC_HEADER_STDC
dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS(Files.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdlib.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h readline/readline.h bfd.h winsock.h)
+AC_CHECK_HEADERS(Files.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdlib.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h readline/readline.h readline/history.h bfd.h winsock.h)
dnl ** check for DOS include files
AC_CHECK_HEADERS(dos.h conio.h io.h std.h)
dnl ** check for DOS include files
AC_CHECK_HEADERS(dos.h conio.h io.h std.h)
@@
-614,6
+624,20
@@
dnl the order of these tests matters: bfd needs liberty
AC_CHECK_LIB(iberty, xmalloc)
AC_CHECK_LIB(bfd, bfd_init)
AC_CHECK_LIB(iberty, xmalloc)
AC_CHECK_LIB(bfd, bfd_init)
+dnl ** check for readline, for Hugs
+AC_CHECK_LIB(readline, readline,
+[
+AC_DEFINE(HAVE_LIBREADLINE,1)
+HaveLibReadline=YES
+],
+[
+AC_DEFINE(HAVE_LIBREADLINE,0)
+HaveLibReadline=NO
+],
+-ltermcap)
+AC_SUBST(HaveLibReadline)
+
+
dnl ################################################################
dnl Check for libraries
dnl ################################################################
dnl ################################################################
dnl Check for libraries
dnl ################################################################