X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=f7f6c09b9011831be985c1ff9d23b32f4cb28707;hb=fd2bd22ed4483f949e989b827013fcda695c803a;hp=d298af87a484fd3ff74ff183e73257a1b62c3544;hpb=4fc80ef6710401b4b249c2bf298986623bdbd503;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index d298af8..f7f6c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1029,7 +1029,7 @@ 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([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_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 sched.h])
 
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
@@ -1107,7 +1107,7 @@ fi
 
 dnl ** check for more functions
 dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
-AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
+AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r, sched_setaffinity])
 
 AC_TRY_RUN([
 #include <sys/types.h>
@@ -1290,7 +1290,7 @@ else
 fi
 AC_SUBST(HavePapi)
 
-AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
+AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
 
@@ -1299,8 +1299,9 @@ AC_OUTPUT
 #     $(eval ...) inside conditionals causes errors
 # with make 3.80, so warn the user if it looks like they're about to
 # try to use it.
+# We would use "grep -q" here, but Solaris's grep doesn't support it.
 checkMake380() {
-    if $1 --version 2>&1 | head -1 | grep -q 'GNU Make 3\.80'
+    if $1 --version 2>&1 | head -1 | grep 'GNU Make 3\.80' > /dev/null
     then
         echo
         echo "WARNING: It looks like \"$1\" is GNU make 3.80."