X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=42415b530a1a8a904f0000119c8b4134bc354f24;hb=4543231901d23f0d6e5d278ff9a2be3d648aa073;hp=9c69f92ffdc376ebdaa7c257a05180091850f9df;hpb=f5b98196d524126a125efb9ab097801f05c4be48;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index 9c69f92..42415b5 100644 --- a/configure.in +++ b/configure.in @@ -137,7 +137,7 @@ i[[3456]]86-*-linux*) HostVendor_CPP='unknown' HostOS_CPP='linux' ;; -i[[3456]]86-*-freebsd[[^0-2]]*) # FreeBSD 3.0+ uses ELF +i[[3456]]86-*-freebsd[[3-9]]*) # FreeBSD 3.0+ uses ELF HostPlatform=i386-unknown-freebsd # hack again TargetPlatform=i386-unknown-freebsd BuildPlatform=i386-unknown-freebsd @@ -434,6 +434,8 @@ AC_PROG_CPP dnl ** figure out how to do context diffs FPTOOLS_PROG_DIFF +dnl ** Find find command (for Win32's benefit) +AC_PATH_PROG(FindCmd, find) dnl ** look for a decent parser generator (bison preferred) dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing @@ -502,7 +504,19 @@ dnl ** check for full ANSI header (.h) files 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 readline/history.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 stdint.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 bfd.h winsock.h) + +AC_CHECK_HEADER(readline/readline.h, HaveReadlineReadlineH=YES, HaveReadlineReadlineH=NO) +AC_CHECK_HEADER(readline/history.h, HaveReadlineHistoryH=YES, HaveReadlineHistoryH=NO) + +if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then + HaveReadlineHeaders=YES + AC_DEFINE(HAVE_READLINE_HEADERS,1) +else + HaveReadlineHeaders=NO + AC_DEFINE(HAVE_READLINE_HEADERS,0) +fi +AC_SUBST(HaveReadlineHeaders) dnl ** check for DOS include files AC_CHECK_HEADERS(dos.h conio.h io.h std.h) @@ -535,27 +549,47 @@ FPTOOLS_ALTZONE dnl ** does struct stat contain st_blksize? AC_STRUCT_ST_BLKSIZE +dnl ** do we have long longs? +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) -AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(unsigned int,4) -AC_CHECK_SIZEOF(float, 4) -AC_CHECK_SIZEOF(double, 8) -AC_CHECK_SIZEOF(long, 4) -AC_CHECK_SIZEOF(void *, 4) +AC_CHECK_SIZEOF(char, 1) +AC_CHECK_SIZEOF(double, 8) +AC_CHECK_SIZEOF(float, 4) +AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) +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 short, 2) +AC_CHECK_SIZEOF(void *, 4) dnl ** what are alignment constraints on various types FPTOOLS_CHECK_ALIGNMENT(char) +FPTOOLS_CHECK_ALIGNMENT(double) +FPTOOLS_CHECK_ALIGNMENT(float) FPTOOLS_CHECK_ALIGNMENT(int) -FPTOOLS_CHECK_ALIGNMENT(void *) -FPTOOLS_CHECK_ALIGNMENT(unsigned int) dnl redundant but harmless FPTOOLS_CHECK_ALIGNMENT(long) -FPTOOLS_CHECK_ALIGNMENT(float) -FPTOOLS_CHECK_ALIGNMENT(double) - -dnl ** do we have long longs? -FPTOOLS_C_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 short) +FPTOOLS_CHECK_ALIGNMENT(void *) dnl ** can we open files in binary mode? FPTOOLS_O_BINARY @@ -647,19 +681,27 @@ dnl the order of these tests matters: bfd needs liberty 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 ** check for readline, for Hugs and hslibs' Readline +dnl ncurses supersedes termcap and curses, but for compatibility, +dnl we have to check for all... +AC_CHECK_LIB(ncurses, tputs, HaveLibTermcap=YES; LibTermcap=ncurses, + AC_CHECK_LIB(termcap, tputs, HaveLibTermcap=YES; LibTermcap=termcap, + AC_CHECK_LIB(curses, tputs, HaveLibTermcap=YES; LibTermcap=curses, + HaveLibTermcap=NO; LibTermcap=not-installed))) + +if test $HaveLibTermcap = YES ; then + LIBS="-l$LibTermcap $LIBS" + AC_CHECK_LIB(readline, readline, HaveLibReadline=YES, HaveLibReadline=NO) +fi +if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then + AC_DEFINE(HAVE_READLINE_LIBS,1) + LibsReadline="-lreadline -l$LibTermcap" +else + AC_DEFINE(HAVE_READLINE_LIBS,0) + LibsReadline= +fi +AC_SUBST(LibsReadline) dnl ################################################################ dnl Check for libraries @@ -688,9 +730,6 @@ AC_C_BIGENDIAN errprint((fptools configure script wizard sez: "don't worry, the above warning is harmless (to us.)") ) -dnl ** determine the return type of signal() -AC_TYPE_SIGNAL - dnl ** check for leading underscores in symbol names FPTOOLS_UNDERSCORE