X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=74550b121d0ad82cc9a9b75c1f6464f460f4f1df;hb=393185426d61a45e0d7f1cb97925b7f7ae0ed278;hp=38f838d7cce03340f43ae015e6966ebbd1b25e21;hpb=de209d2b0e7deb0520625847375c2595577781a2;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 38f838d..74550b1 100644
--- a/configure.in
+++ b/configure.in
@@ -164,6 +164,15 @@ i[[3456]]86-*-netbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='netbsd'
         ;;
+i[[3456]]86-*-openbsd*)
+	HostPlatform=i386-unknown-openbsd # hack again
+	TargetPlatform=i386-unknown-openbsd
+	BuildPlatform=i386-unknown-openbsd
+        HostPlatform_CPP='i386_unknown_openbsd'
+        HostArch_CPP='i386'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 i[[3456]]86-*-solaris2*)
 	HostPlatform=i386-unknown-solaris2 # hack again
 	TargetPlatform=i386-unknown-solaris2
@@ -322,7 +331,17 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
-AC_PATH_PROG(GHC,ghc)
+if test "$GHC" = ""; then
+  AC_PATH_PROG(GHC,ghc)
+fi
+if test "$GHC" != ""; then
+  FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
+  AC_SUBST(GhcVersion)dnl
+  AC_SUBST(GhcMajVersion)dnl
+  AC_SUBST(GhcMinVersion)dnl
+  AC_SUBST(GhcPatchLevel)dnl
+fi
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -407,15 +426,27 @@ dnl --------------------------------------------------------------
 dnl ** does #! work?
 AC_SYS_INTERPRETER()
 
-dnl ** look for `perl', but watch out for version 4.035
-AC_PATH_PROG(PerlCmd,perl)
-if test -z "$PerlCmd"; then
-   echo "You must install perl before you can continue"
-   echo "Perhaps it is already installed, but not in your PATH?"
-   exit 1
-else
-FPTOOLS_CHECK_PERL_VERSION
-fi
+dnl ** look for `perl', but only in /bin on Windows
+case $HostOS_CPP in
+cygwin32|mingw32)
+   AC_CHECK_PROG(PerlCmd,perl,/bin/perl,,/bin)
+   if test -z "$PerlCmd"; then
+      echo "You must install the version of Perl shipped with GHC"
+      echo "(or a compatible one) in /bin."
+      exit 1
+   fi
+   ;;
+*)
+   AC_PATH_PROG(PerlCmd,perl)
+   if test -z "$PerlCmd"; then
+      echo "You must install perl before you can continue"
+      echo "Perhaps it is already installed, but not in your PATH?"
+      exit 1
+   else
+   FPTOOLS_CHECK_PERL_VERSION
+   fi
+   ;;
+esac
 
 dnl ** does #! path/to/perl work? (sometimes it's too long...)
 FPTOOLS_SHEBANG_PERL
@@ -476,6 +507,15 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 dnl ** check for gzip/compress
 AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
 
+dnl ** check for jade/openjade & determine a working catalog
+AC_PATH_PROGS(JadeCmd,openjade jade,jade)
+FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
+                        /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
+if test -z "$Catalog"; then
+  AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
+fi
+AC_SUBST(Catalog)
+
 compress_nm=`basename $CompressCmd`
 if test x"$compress_nm" = xgzip; then
   CompressCmd="$CompressCmd -d"
@@ -504,7 +544,19 @@ 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 assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.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 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/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h readline/readline.h readline/history.h bfd.h winsock.h)
+AC_CHECK_HEADERS(Files.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.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 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/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)
+
+if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then
+  HaveReadlineHeaders=YES
+  AC_DEFINE(HAVE_READLINE_HEADERS,1)
+else
+  HaveReadlineHeaders=NO
+  AC_DEFINE(HAVE_READLINE_HEADERS,0)
+fi
+AC_SUBST(HaveReadlineHeaders)
 
 dnl ** check for DOS include files
 AC_CHECK_HEADERS(dos.h conio.h io.h std.h) 
@@ -579,6 +631,30 @@ fi
 FPTOOLS_CHECK_ALIGNMENT(unsigned short)
 FPTOOLS_CHECK_ALIGNMENT(void *)
 
+dnl ** map standard C types and ISO types to Haskell types
+FPTOOLS_CHECK_HTYPE(char)
+FPTOOLS_CHECK_HTYPE(signed char)
+FPTOOLS_CHECK_HTYPE(unsigned char)
+FPTOOLS_CHECK_HTYPE(short)
+FPTOOLS_CHECK_HTYPE(unsigned short)
+FPTOOLS_CHECK_HTYPE(int)
+FPTOOLS_CHECK_HTYPE(unsigned int)
+FPTOOLS_CHECK_HTYPE(long)
+FPTOOLS_CHECK_HTYPE(unsigned long)
+if test "$fptools_cv_have_long_long" = yes; then
+FPTOOLS_CHECK_HTYPE(long long)
+FPTOOLS_CHECK_HTYPE(unsigned long long)
+fi
+FPTOOLS_CHECK_HTYPE(float)
+FPTOOLS_CHECK_HTYPE(double)
+FPTOOLS_CHECK_HTYPE(ptrdiff_t)
+FPTOOLS_CHECK_HTYPE(size_t)
+FPTOOLS_CHECK_HTYPE(wchar_t)
+dnl Int32 is a HACK for non-ISO C compilers
+FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32)
+FPTOOLS_CHECK_HTYPE(clock_t)
+FPTOOLS_CHECK_HTYPE(time_t)
+
 dnl ** can we open files in binary mode?
 FPTOOLS_O_BINARY
 
@@ -664,27 +740,35 @@ AC_CHECK_LIB(gmp,  mpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
 AC_SUBST(HaveLibGmp)
 AC_SUBST(LibGmp)
 
+dnl ** check whether this machine has GNU regex in libc.
+FPTOOLS_REGEX_IN_LIBC
+
 dnl ** check whether this machine has BFD and liberty installed (used for debugging)
 dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
 AC_CHECK_LIB(bfd,    bfd_init)
 
-dnl ** check for readline, for Hugs
-dnl termcap is obsoleted by ncurses, but for compatibility, we have to
-dnl check for both...
-AC_SEARCH_LIBS(tputs, [ncurses termcap])
-
-AC_CHECK_LIB(readline, readline,
-[
-AC_DEFINE(HAVE_LIBREADLINE,1)
-HaveLibReadline=YES
-],
-[
-AC_DEFINE(HAVE_LIBREADLINE,0)
-HaveLibReadline=NO
-])
-AC_SUBST(HaveLibReadline)
+dnl ** check for readline, for Hugs and hslibs' Readline
+dnl ncurses supersedes termcap and curses, but for compatibility,
+dnl we have to check for all...
+AC_CHECK_LIB(ncurses, tputs, HaveLibTermcap=YES; LibTermcap=ncurses,
+  AC_CHECK_LIB(termcap, tputs, HaveLibTermcap=YES; LibTermcap=termcap,
+    AC_CHECK_LIB(curses, tputs, HaveLibTermcap=YES; LibTermcap=curses,
+      HaveLibTermcap=NO; LibTermcap=not-installed)))
+
+if test $HaveLibTermcap = YES ; then
+  LIBS="-l$LibTermcap $LIBS"
+  AC_CHECK_LIB(readline, readline, HaveLibReadline=YES, HaveLibReadline=NO)
+fi
 
+if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
+  AC_DEFINE(HAVE_READLINE_LIBS,1)
+  LibsReadline="-lreadline -l$LibTermcap"
+else
+  AC_DEFINE(HAVE_READLINE_LIBS,0)
+  LibsReadline=
+fi
+AC_SUBST(LibsReadline)
 
 dnl ################################################################
 dnl Check for libraries