X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=beee6a67a537a33382d996ebc834d616504e6bf9;hp=0df85655117ef88deb0a4aea47e0009882d0cc08;hb=332e20e5531e0c44c07f133297b8879062d0659d;hpb=64470ac297ab1cc9a1f53ec285099eda6655814a

diff --git a/configure.ac b/configure.ac
index 0df8565..beee6a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 limits.h locale.h malloc.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stddef.h stdarg.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/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.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([arpa/inet.h bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h netdb.h netinet/in.h netinet/tcp.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/socket.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/uio.h sys/un.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,12 +984,9 @@ CPPFLAGS="$fp_save_cppflags"
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
 
-dnl dynamic loading include files
-AC_CHECK_HEADERS(dlfcn.h dl.h) 
-
 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 ?
@@ -1010,7 +1002,6 @@ dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
 dnl ** check what fields struct msghdr contains
-AC_CHECK_HEADERS([sys/socket.h sys/uio.h])
 AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], [], [], [#if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -1207,9 +1198,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,
@@ -1435,7 +1424,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)