projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eceaec3
)
Tweak the configure script Windows-specific bits
author
Ian Lynagh
<igloo@earth.li>
Thu, 3 Jul 2008 13:24:37 +0000
(13:24 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 3 Jul 2008 13:24:37 +0000
(13:24 +0000)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
31e827b
..
f22ffbe
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-683,13
+683,12
@@
AC_ARG_WITH(gcc,
[AC_HELP_STRING([--with-gcc=ARG],
[Use ARG as the path to GCC [default=autodetect]])],
[WhatGccIsCalled="$withval"
[AC_HELP_STRING([--with-gcc=ARG],
[Use ARG as the path to GCC [default=autodetect]])],
[WhatGccIsCalled="$withval"
- if test "x$HostPlatform" = "xi386-unknown-mingw32"
- then
- if test "${OSTYPE}" != "msys"
- then
- # Canonicalise to <drive>:/path/to/gcc
- withval=`cygpath -m ${withval}`
- fi
+ if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
+ test "${OSTYPE}" != "msys" && \
+ test "${withval}" != ""
+ then
+ # Canonicalise to <drive>:/path/to/gcc
+ withval=`cygpath -m ${withval}`
fi;
CC="$withval"
export CC
fi;
CC="$withval"
export CC
@@
-703,13
+702,12
@@
dnl --------------------------------------------------------------
AC_ARG_WITH(ld,
[AC_HELP_STRING([--with-ld=ARG],
[Use ARG as the path to LD [default=autodetect]])],
AC_ARG_WITH(ld,
[AC_HELP_STRING([--with-ld=ARG],
[Use ARG as the path to LD [default=autodetect]])],
-[if test "x$HostPlatform" = "xi386-unknown-mingw32"
- then
- if test "${OSTYPE}" != "msys"
- then
- # Canonicalise to <drive>:/path/to/ld
- withval=`cygpath -m ${withval}`
- fi
+[if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
+ test "${OSTYPE}" != "msys" && \
+ test "${withval}" != ""
+ then
+ # Canonicalise to <drive>:/path/to/ld
+ withval=`cygpath -m ${withval}`
fi;
LD=$withval
FP_PROG_LD([$LD])
fi;
LD=$withval
FP_PROG_LD([$LD])
@@
-956,13
+954,12
@@
AC_PATH_PROGS(TarCmd,gtar tar,tar)
AC_PATH_PROG(HSCOLOUR,HsColour)
# HsColour is passed to Cabal, so we need a native path
AC_PATH_PROG(HSCOLOUR,HsColour)
# HsColour is passed to Cabal, so we need a native path
-if test "x$HostPlatform" = "xi386-unknown-mingw32"
- then
- if test "${OSTYPE}" != "msys"
- then
- # Canonicalise to <drive>:/path/to/gcc
- HSCOLOUR=`cygpath -m ${HSCOLOUR}`
- fi
+if test "x$HostPlatform" = "xi386-unknown-mingw32" && \
+ test "${OSTYPE}" != "msys" && \
+ test "${HSCOLOUR}" != ""
+then
+ # Canonicalise to <drive>:/path/to/gcc
+ HSCOLOUR=`cygpath -m ${HSCOLOUR}`
fi
dnl ** check for DocBook toolchain
fi
dnl ** check for DocBook toolchain