projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make install-sh executable /before/ we try to find it
[ghc-hetmet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
b5a7aa8
..
84d6c6d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-161,7
+161,7
@@
amd64-*-openbsd*|x86_64-*-openbsd*)
HostVendor_CPP='unknown'
HostOS_CPP='openbsd'
;;
HostVendor_CPP='unknown'
HostOS_CPP='openbsd'
;;
-amd64-*-freebsd*)
+amd64-*-freebsd*|x86_64-*-freebsd*)
HostPlatform=x86_64-unknown-freebsd
TargetPlatform=x86_64-unknown-freebsd
BuildPlatform=x86_64-unknown-freebsd
HostPlatform=x86_64-unknown-freebsd
TargetPlatform=x86_64-unknown-freebsd
BuildPlatform=x86_64-unknown-freebsd
@@
-899,11
+899,11
@@
FP_PROG_FIND
dnl ** Find sort command (for the benefit of Win32 environs)
FP_PROG_SORT
dnl ** Find sort command (for the benefit of Win32 environs)
FP_PROG_SORT
-dnl ** figure out how to do a BSD-ish install
-AC_PROG_INSTALL
dnl Let's make sure install-sh is executable here. If we got it from
dnl a darcs repo, it might not be (see bug #978).
chmod +x install-sh
dnl Let's make sure install-sh is executable here. If we got it from
dnl a darcs repo, it might not be (see bug #978).
chmod +x install-sh
+dnl ** figure out how to do a BSD-ish install
+AC_PROG_INSTALL
dnl If you can run configure, you certainly have /bin/sh
AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
dnl If you can run configure, you certainly have /bin/sh
AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
@@
-927,6
+927,8
@@
dnl ** check for tar
dnl if GNU tar is named gtar, look for it first.
AC_PATH_PROGS(TarCmd,gtar tar,tar)
dnl if GNU tar is named gtar, look for it first.
AC_PATH_PROGS(TarCmd,gtar tar,tar)
+AC_PATH_PROG(HSCOLOUR,HsColour)
+
dnl ** check for DocBook toolchain
FP_CHECK_DOCBOOK_DTD
FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl])
dnl ** check for DocBook toolchain
FP_CHECK_DOCBOOK_DTD
FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl])