X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=f6b3664af8f5e530ffe4b888772f08ccfe07dfd3;hb=a18b4ebe53b92bdfd298714eceaec3f165059b8d;hp=12ed4cf11fbe9bffb5877a9b39864b04de163941;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 12ed4cf..f6b3664 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
@@ -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)
@@ -341,10 +355,10 @@ dnl ** check if perl library is properly installed
 if $PerlCmd -e 'do "getopts.pl" || exit(1); exit(0);' > /dev/null 2>&1 ; then
     :
 else
-    echo "I think your perl library is misinstalled."
+    echo "I think your perl library is misinstalled:"
     echo "The following script did not work:"
     echo '      do "getopts.pl" || exit(1); exit(0);'
-    exit 1
+    echo 'But, anyway, we will continue in our quest..'
 fi
 #
 #
@@ -556,21 +570,31 @@ AC_PATH_PROG(LxCmd,lx)
 AC_SUBST(LxCmd)
 #
 #
+dnl ** check for installed green-card binary
+#
+AC_PATH_PROG(GreencardCmd,green-card)
+AC_SUBST(GreencardCmd)
+#
+#
 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 )
+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
+HaveAltZone=yes
+AC_MSG_CHECKING([for altzone])
+AC_TRY_LINK([#include <time.h>], [return altzone;], AC_DEFINE(HAVE_ALTZONE),HaveAltZone=no)
+AC_MSG_RESULT($HaveAltZone)
 # 
 dnl ** determine the type of signal()
 #
@@ -618,14 +642,14 @@ AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
 # check here on the generated config.mk file to see if the
 # sed that was used is of the well-behaved sort.
 #
-grep @ mk/config.mk > conftest.out
-if grep -v '#	   enclosed in @at-signs@.' conftest.out >/dev/null 2>&1; then
-   :
-else
-   echo 'Hmm..suspicious, did the configure script perform all the @..@ substitutions in mk/config.mk?..';
-   grep -v '#	   enclosed in @at-signs@.' conftest.out /dev/null
-fi
-rm -f conftest*
+#grep @ mk/config.mk > conftest.out
+#if grep -v '#	   enclosed in @at-signs@.' conftest.out >/dev/null 2>&1; then
+#   :
+#else
+#   echo 'Hmm..suspicious, did the configure script perform all the @..@ substitutions in mk/config.mk?..';
+#   grep -v '#	   enclosed in @at-signs@.' conftest.out /dev/null
+#fi
+#rm -f conftest*
 
 echo ''
 echo '************************************************'