X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=5fee36b42a75e2de4a86d11af92580f4a18ded67;hb=472fd32043a80be1c6d7a518b355e838748c521e;hp=89dfaebbd37559640d450351a7f258d3c1e83149;hpb=bd1440159f823d06b0836640311f73cb1916b68b;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 89dfaeb..5fee36b 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,6 @@ if test x"$TargetPlatform" != x"$HostPlatform" ; then
     echo "GHC configuration does not support differing host/target (i.e., cross-compiling)"
     exit 1
 fi
-
 #
 # The following will be more difficult when we *are* cross-compiling.
 # Suitable names to slam in *_CPP are in platform.h.in.
@@ -192,6 +191,15 @@ mips-sgi-irix*)
         HostVendor_CPP='sgi'
         HostOS_CPP='irix'
         ;;
+rs6000-ibm-aix*)
+	HostPlatform=rs6000-ibm-aix
+	TargetPlatform=rs6000-ibm-aix #hack
+	BuildPlatform=rs6000-ibm-aix #hack
+        HostPlatform_CPP='rs6000_ibm_aix'
+        HostArch_CPP='rs6000'
+        HostVendor_CPP='ibm'
+        HostOS_CPP='aix'
+        ;;
 powerpc-ibm-aix*)
 	HostPlatform=powerpc-ibm-aix
 	TargetPlatform=powerpc-ibm-aix #hack
@@ -224,7 +232,7 @@ sparc-sun-solaris2*)
         exit 1
         ;;
 esac
-echo "Which we'll canonicalise into: $HostPlatform"
+echo "Canonicalised to: $HostPlatform"
 test  x"$HostPlatform" != x"$TargetPlatform" && echo "Target platform set to $TargetPlatform"
 test  x"$BuildPlatform" != x"$HostPlatform"  && echo "Build platform set to $BuildPlatform"
 
@@ -233,23 +241,29 @@ TargetPlatform_CPP=$HostPlatform_CPP
 BuildArch_CPP=$HostArch_CPP
 TargetArch_CPP=$HostArch_CPP
 BuildOS_CPP=$HostOS_CPP
+HostOS_Full=$host_os
 TargetOS_CPP=$HostOS_CPP
 BuildVendor_CPP=$HostVendor_CPP
 TargetVendor_CPP=$HostVendor_CPP
 
 dnl Cannot afford all these SUBSTs (because of braindead seds w/ 99 cmd limits)
 dnl AC_SUBST(BuildPlatform)
+
 AC_SUBST(HostPlatform)
 AC_SUBST(TargetPlatform)
 AC_SUBST(HostPlatform_CPP)
 dnl AC_SUBST(BuildPlatform_CPP)
 dnl AC_SUBST(TargetPlatform_CPP)
+
 AC_SUBST(HostArch_CPP)
 dnl AC_SUBST(BuildArch_CPP)
 dnl AC_SUBST(TargetArch_CPP)
+
 AC_SUBST(HostOS_CPP)
+AC_SUBST(HostOS_Full)
 dnl AC_SUBST(BuildOS_CPP)
 dnl AC_SUBST(TargetOS_CPP)
+
 AC_SUBST(HostVendor_CPP)
 dnl AC_SUBST(BuildVendor_CPP)
 dnl AC_SUBST(TargetVendor_CPP)
@@ -527,7 +541,7 @@ dnl ** check for tar **
 # if GNU tar is named gtar, look for it first.
 #
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
-AC_SUBST(TarCmd)
+
 
 #
 dnl ** check for gzip/compress **
@@ -547,69 +561,63 @@ AC_SUBST(CompressSuffix)
 dnl ** check for installed happy binary
 #
 AC_PATH_PROG(HappyCmd,happy)
-AC_SUBST(HappyCmd)
+
 #
 #
 dnl ** check for installed lx binary
 #
 AC_PATH_PROG(LxCmd,lx)
-AC_SUBST(LxCmd)
+
 #
+dnl ** check for installed green-card binary
 #
+AC_PATH_PROG(GreencardCmd,green-card)
+
 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(dirent.h fcntl.h grp.h malloc.h memory.h nlist.h pwd.h siginfo.h signal.h stdlib.h string.h sys/fault.h sys/file.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termios.h time.h types.h unistd.h utime.h vfork.h readline/readline.h )
+
 #
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 #
 AC_HEADER_TIME
 #
-dnl ** how do we get a timezone name?
+dnl ** how do we get a timezone name, and UTC offset ?
 #
 AC_STRUCT_TIMEZONE
+
 # 
-dnl ** determine the type of signal()
+dnl what's the type of timezone?
+AC_TYPE_TIMEZONE
+
 #
-AC_TYPE_SIGNAL
+dnl do we have altzone?
+AC_ALTZONE
+
 #
 dnl ** check for specific library functions that we are interested in
 #
 AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect setitimer stat sysconf timelocal times vadvise vfork)
+
 #
-dnl ** can we get alloca?
+# Misc
 #
+dnl ** can we get alloca?
 AC_FUNC_ALLOCA
-#
 dnl ** determine whether or not const works
-#
 AC_C_CONST
+dnl ** determine the type of signal()
+AC_TYPE_SIGNAL
+
 #
 dnl ** check for leading underscores in symbol names
-# We assume that they _aren't_ there if anything goes wrong.
-#
-echo checking for a leading underscore in symbol names
-AC_TRY_RUN(
-[#ifdef HAVE_NLIST_H
-#include <nlist.h>
-struct nlist xYzzY[] = {{"_xYzzY", 0},{0}};
-#endif
-
-main(argc, argv)
-int argc;
-char **argv;
-{
-#ifdef HAVE_NLIST_H
-    if(nlist(argv[0], xYzzY) == 0 && xYzzY[0].n_value != 0)
-        exit(0);
-#endif
-    exit(1);
-}], LeadingUnderscore='YES', LeadingUnderscore='NO', LeadingUnderscore='YES')
-test -n "$verbose" && echo "    setting LeadingUnderscore to $LeadingUnderscore"
-AC_SUBST(LeadingUnderscore)
+#
+AC_UNDERSCORE
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )