X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=75c40111d46b01ce34ae14bc413dec934dcd49d2;hb=61243965f2937a6426885af62f92d9f3bf44c05b;hp=9a731ec66977259f523e0fb622c305fd325c3146;hpb=43b3348045eb2dd541949353ce0a1ea299ba7884;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 9a731ec..75c4011 100644 --- a/configure.ac +++ b/configure.ac @@ -735,7 +735,7 @@ AC_ARG_ENABLE([openal], GhcLibsWithOpenAL=NO fi ], - [GhcLibsWithOpenAL=yes]) + [GhcLibsWithOpenAL=YES]) AC_SUBST([GhcLibsWithOpenAL]) @@ -856,7 +856,7 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar) dnl ** check for DocBook toolchain FP_CHECK_DOCBOOK_DTD -FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl]) +FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl]) FP_PROG_FO_PROCESSOR dnl ** check for ghc-pkg command @@ -938,11 +938,12 @@ dnl off_t, because it will affect the result of that test. AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in -AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h limits.h locale.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stddef.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 netdb.h netinet/in.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/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h bfd.h winsock.h pthread.h sys/uio.h) -AC_CHECK_HEADER(unistd.h,[AC_CHECK_FUNCS(lchown)]) +AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h]) -AC_CHECK_HEADER(readline/readline.h, [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO]) -AC_CHECK_HEADER(readline/history.h, [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO]) +AC_CHECK_HEADER([unistd.h], [AC_CHECK_FUNCS(lchown)]) + +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 GhcLibsWithReadline=YES @@ -953,12 +954,6 @@ else fi AC_SUBST(GhcLibsWithReadline) -dnl ** check for DOS include files -AC_CHECK_HEADERS(dos.h conio.h io.h std.h) - -dnl ** check for Windows include files -AC_CHECK_HEADERS(windows.h) - dnl ** check for OpenGL/GLUT include paths and libraries FP_CHECK_GLUT @@ -989,18 +984,9 @@ CPPFLAGS="$fp_save_cppflags" dnl ** check if it is safe to include both and AC_HEADER_TIME -dnl dynamic loading include files -AC_CHECK_HEADERS(dlfcn.h dl.h) - -dnl ** check for farcalloc (in bcc) -AC_CHECK_HEADER(alloc.h,[AC_CHECK_FUNCS(farcalloc)]) - -dnl ** check for valloc (in sunos, solaris, mips, amiga, next, minix, ultrix) -AC_CHECK_HEADER(malloc.h,[AC_CHECK_FUNCS(valloc)]) - dnl ** check for POSIX regex HavePosixRegex=NO -AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])]) +AC_CHECK_HEADERS([regex.h], [AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])]) AC_SUBST(HavePosixRegex) dnl ** how do we get a timezone name, and UTC offset ? @@ -1015,18 +1001,6 @@ AC_STRUCT_ST_BLKSIZE dnl ** do we have long longs? AC_CHECK_TYPES([long long]) -dnl ** check what fields struct msghdr contains -AC_CHECK_HEADERS([sys/types.h sys/socket.h sys/uio.h]) -AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], [], [], [#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_SOCKET_H -# include -#endif -#if HAVE_SYS_UIO_H -# include -#endif]) - dnl ** what are the sizes of various types AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(double, 8) @@ -1159,15 +1133,7 @@ if test "$ac_cv_type_signal" = void; then fi dnl ** check for more functions -AC_CHECK_FUNCS([setenv unsetenv]) -dnl Note: The following test would make sense but the respective code -dnl doesn't use HAVE_BLAH #ifdefs yet. -dnl AC_CHECK_FUNCS([strcasecmp _stricmp], [break]) -dnl AC_CHECK_FUNCS([snprintf _snprintf], [break]) - - -dnl ** check for specific library functions that we are interested in -AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat siginterrupt symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r) +AC_CHECK_FUNCS([ftime getclock getgrgid_r getgrnam_r getpagesize getpwnam_r getpwuid_r getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv]) dnl ** Solaris2 needs additionl flag for getpw*_r() case "$TargetPlatform" in @@ -1221,9 +1187,7 @@ AC_CHECK_LIB(bfd, bfd_init) dnl ** check for wide-char classifications dnl FreeBSD has an emtpy wctype.h, so test one of the affected dnl functions if it's really there. -AC_CHECK_HEADERS(wctype.h, - [AC_CHECK_FUNCS(iswspace)] -) +AC_CHECK_HEADERS([wctype.h], [AC_CHECK_FUNCS(iswspace)]) dnl ** check for readline, for Hugs and hslibs' Readline dnl ncurses supersedes termcap and curses, but for compatibility, @@ -1302,7 +1266,6 @@ else AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().]) LIBS="$LIBS -ldl"], [HaveLibDL=NO]) - AC_CHECK_FUNCS(dlopen) AC_SUBST(HaveLibDL) dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set @@ -1396,30 +1359,6 @@ case "$cv_func_usleep_return_type" in esac dnl -------------------------------------------------- -dnl * test for in_addr_t -dnl -------------------------------------------------- -AC_MSG_CHECKING(for in_addr_t in netinet/in.h) -AC_EGREP_HEADER(in_addr_t, netinet/in.h, - [ AC_DEFINE([HAVE_IN_ADDR_T], [1], [Define to 1 if in_addr_t is available.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for Linux sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/sendfile.h) -AC_EGREP_HEADER(sendfile, sys/sendfile.h, - [ AC_DEFINE([HAVE_LINUX_SENDFILE], [1], [Define to 1 if you have a Linux sendfile(2) implementation.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- -dnl * test for BSD sendfile(2) -dnl -------------------------------------------------- -AC_MSG_CHECKING(for sendfile in sys/socket.h) -AC_EGREP_HEADER(sendfile, sys/socket.h, - [ AC_DEFINE([HAVE_BSD_SENDFILE], [1], [Define to 1 if you have a BSDish sendfile(2) implementation.]) AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - -dnl -------------------------------------------------- dnl * test for GTK+ dnl -------------------------------------------------- @@ -1450,7 +1389,7 @@ dnl ** are we big endian? AC_C_BIGENDIAN dnl ** check for leading underscores in symbol names -FPTOOLS_UNDERSCORE +FP_LEADING_UNDERSCORE dnl ** check for ld, and whether ld has -x option AC_PATH_PROG(LdCmdRaw, ld) @@ -1471,10 +1410,6 @@ FPTOOLS_LD_X FP_EMPTY_STRUCTS -dnl ** Check for idiosyncracies in some mingw impls of directory handling. -FP_READDIR_EOF_ERRNO -FP_DIRENT_FLAT_LAYOUT - AC_MSG_CHECKING([for SIGPOLL]) AC_EGREP_CPP(we_have_sigpoll, [#include @@ -1484,28 +1419,22 @@ we_have_sigpoll ], AC_DEFINE([HAVE_SIGPOLL], [1], [Define to 1 if you have the sigpoll() function.]) haveSIGPOLL=yes, haveSIGPOLL=no) AC_MSG_RESULT([$haveSIGPOLL]) -AC_MSG_CHECKING([for _SC_GETGR_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETGR_R_SIZE_MAX -we_have_that_sysconf_thing +AC_MSG_CHECKING([for SIGINFO]) +AC_EGREP_CPP(we_have_siginfo, +[#include +#ifdef SIGINFO +we_have_siginfo #endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_SC_GETGR_R_SIZE_MAX], [1], [Define to 1 if defines _SC_GETGR_R_SIZE_MAX.])], -[AC_MSG_RESULT([no])]) +], AC_DEFINE([HAVE_SIGINFO], [1], [Define to 1 if you have the INFO-signal.]) haveSIGINFO=yes, haveSIGINFO=no) +AC_MSG_RESULT([$haveSIGINFO]) -AC_MSG_CHECKING([for _SC_GETPW_R_SIZE_MAX]) -AC_EGREP_CPP(we_have_that_sysconf_thing, -[ -#include -#ifdef _SC_GETPW_R_SIZE_MAX -we_have_that_sysconf_thing +AC_MSG_CHECKING([for SIGWINCH]) +AC_EGREP_CPP(we_have_sigwinch, +[#include +#ifdef SIGWINCH +we_have_sigwinch #endif -], -[AC_MSG_RESULT([yes]) -AC_DEFINE([HAVE_SC_GETPW_R_SIZE_MAX], [1], [Define to 1 if defines _SC_GETPW_R_SIZE_MAX.])], -[AC_MSG_RESULT([no])]) +], AC_DEFINE([HAVE_SIGWINCH], [1], [Define to 1 if you have the WINCH-signal.]) haveSIGWINCH=yes, haveSIGWINCH=no) +AC_MSG_RESULT([$haveSIGWINCH]) AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )