X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=d5427d4d963f823d4be6a4487f0328073f3167fc;hb=1a8d01f99c116ea79fa765afc8f8f6129c5b270d;hp=a35ad4a1c7425383d3d88de0db4917e450bc15e2;hpb=27d13cb655147c28eeed0f06cac6fc40c5d778aa;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index a35ad4a..d5427d4 100644
--- a/configure.in
+++ b/configure.in
@@ -346,17 +346,19 @@ dnl use either is considered a Feature.
 
 dnl ** What command to use to compile compiler sources ?
 dnl --------------------------------------------------------------
-if test "$GHC" = ""; then
-  AC_PATH_PROG(GHC,ghc)
-fi
 
 AC_ARG_WITH(ghc,
 [  --with-ghc=<haskell compiler>
         Use a command different from 'ghc' to compile GHC-specific Haskell code
 	    (including GHC itself).
 ],
-[WithGhc="$withval"],
-[WithGhc=$GHC]
+[ WithGhc="$withval" ],
+[ 
+  if test "$GHC" = ""; then
+    AC_PATH_PROG(GHC,ghc)
+  fi
+  WithGhc=$GHC
+]
 )
 AC_SUBST(WithGhc)
 
@@ -588,13 +590,16 @@ FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl,
 if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
-case $HostOS_CPP in
-   mingw32)
-      Catalog=`cygpath -w $hardtop/$Catalog`
-      ;;
-   *)
-      Catalog=$hardtop/$Catalog
-      ;;
+case $Catalog in
+   glafp*) 
+	case $HostOS_CPP in
+	   mingw32)
+	      Catalog=`cygpath -w $hardtop/$Catalog`
+	      ;;
+	   *) Catalog=$hardtop/$Catalog
+	      ;;
+	esac
+   ;;
 esac   
 AC_SUBST(Catalog)
 
@@ -626,7 +631,7 @@ dnl ** check for full ANSI header (.h) files
 AC_HEADER_STDC
 
 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 malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.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 vfork.h bfd.h winsock.h)
+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 malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.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 vfork.h bfd.h winsock.h)
 
 AC_CHECK_HEADER(readline/readline.h, HaveReadlineReadlineH=YES, HaveReadlineReadlineH=NO)
 AC_CHECK_HEADER(readline/history.h, HaveReadlineHistoryH=YES, HaveReadlineHistoryH=NO)
@@ -836,7 +841,7 @@ AC_CHECK_FUNCS(pclose    _pclose )
 
 
 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 symlink sysconf timelocal times vadvise vfork)
+AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise vfork localtime_r gmtime_r)
 
 dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,