projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-11-10 12:05:04 by simonpj]
[ghc-hetmet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
66001ed
..
baa2f7d
100644
(file)
--- 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)
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
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
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
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
dnl ** check if it is safe to include both <time.h> and <sys/time.h>
AC_HEADER_TIME
@@
-1124,8
+1127,8
@@
if test $HaveLibMingwEx = YES ; then
fi
if test "$HaveLibGmp" = "NO"; then
fi
if test "$HaveLibGmp" = "NO"; then
-if test "$HostArch_CPP" = "ia64"; then
-AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64).])
+if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then
+AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).])
fi;
fi;
fi;
fi;