X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=360b07b52c8a19f0a35d9d8eeb7758cdb5d1ef08;hb=6c20d552d0d9d307ddaa9c032fd031c743a85a79;hp=40ec87ff5155e90c8b5ee910dd3336c952638441;hpb=bb018f1624441ff74a6e04a8d0e185fd40f00eda;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 40ec87f..360b07b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,7 +716,7 @@ dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF
 
 dnl ** Find find command (for Win32's benefit)
-FPTOOLS_FIND_FIND
+FP_PROG_FIND
 
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
@@ -861,11 +861,14 @@ dnl ** check for Windows include files
 AC_CHECK_HEADERS(windows.h)
 
 dnl ** check for OpenGL include files
+fp_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 if test $UseQuartzOpenGL = YES ; then
   AC_CHECK_HEADERS(OpenGL/gl.h)
 else
   AC_CHECK_HEADERS(GL/gl.h)
 fi
+CPPFLAGS="$fp_save_cppflags"
 
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
@@ -881,7 +884,7 @@ AC_CHECK_HEADER(malloc.h,[AC_CHECK_FUNCS(valloc)])
 
 dnl ** check for POSIX regex
 HavePosixRegex=NO
-AC_CHECK_HEADER(regex.h,[AC_CHECK_FUNC(regcomp, [HavePosixRegex=YES])])
+AC_CHECK_HEADERS(regex.h,[AC_CHECK_FUNC(regcomp, [HavePosixRegex=YES])])
 AC_SUBST(HavePosixRegex)
 
 dnl ** how do we get a timezone name, and UTC offset ?
@@ -983,6 +986,7 @@ FPTOOLS_CHECK_HTYPE(blkcnt_t)
 FPTOOLS_CHECK_HTYPE(nlink_t)
 FPTOOLS_CHECK_HTYPE(ssize_t)
 FPTOOLS_CHECK_HTYPE(rlim_t)
+FPTOOLS_CHECK_HTYPE(wint_t)
 
 dnl ** Map OpenGL data types to Haskell types
 if test $GhcLibsWithHOpenGL = YES ; then
@@ -1082,7 +1086,7 @@ AC_CHECK_FUNCS(setenv unsetenv)
 
 
 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 symlink sysconf timelocal times vadvise localtime_r gmtime_r readdir_r getgrgid_r getgrnam_r getpwuid_r getpwnam_r)
+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)
 
 dnl ** Solaris2 needs additionl flag for getpw*_r()
 case "$TargetPlatform" in