X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=6792491590d704205bfafa3d53bca4367d0edd01;hp=c11d6632495b7266fa2d39f7a889ae22a127aea6;hb=2fe38b5fb0957f9428864afd69ad3ccd82fae3d0;hpb=ae368b7c1654da96e4ca1a0485fe6e0818ef8426 diff --git a/configure.ac b/configure.ac index c11d663..6792491 100644 --- a/configure.ac +++ b/configure.ac @@ -296,7 +296,7 @@ checkVendor() { checkOS() { case $1 in - linux|freebsd|netbsd|openbsd|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) + linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) ;; *) echo "Unknown OS '$1'" @@ -391,7 +391,6 @@ then test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.gz || test inplace/mingw -ot ghc-tarballs/mingw/libcrypt*.tar.bz2 || test inplace/mingw -ot ghc-tarballs/mingw/mingw-runtime*.tar.gz || - test inplace/mingw -ot ghc-tarballs/mingw/perl*.tar.bz2 || test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz then AC_MSG_NOTICE([Making in-tree mingw tree]) @@ -404,13 +403,25 @@ then tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz && tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2 && tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz && - tar -jxf ../../ghc-tarballs/mingw/perl*.tar.bz2 && tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz && mv bin/gcc.exe bin/realgcc.exe ) inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe AC_MSG_NOTICE([In-tree mingw tree created]) fi + if ! test -d inplace/perl || + test inplace/perl -ot ghc-tarballs/perl/ghc-perl*.tar.gz + then + AC_MSG_NOTICE([Making in-tree perl tree]) + rm -rf inplace/perl + mkdir inplace + mkdir inplace/perl + ( + cd inplace/perl && + tar -zxf ../../ghc-tarballs/perl/ghc-perl*.tar.gz + ) + AC_MSG_NOTICE([In-tree perl tree created]) + fi fi dnl ** Which gcc to use? @@ -426,6 +437,21 @@ FP_ARG_WITH_PATH_GNU_PROG([LD], [ld]) LdCmd="$LD" AC_SUBST([LdCmd]) +dnl ** Check for dlltool on Windows +dnl -------------------------------------------------------------- +case $HostOS_CPP in +cygwin32|mingw32) + AC_PATH_PROG(DlltoolCmd,dlltool) + if test -z "$DlltoolCmd"; then + echo "Can't find dlltool in your path, can't make DLLs." + exit 1 + fi + ;; +*) + AC_SUBST(DlltoolCmd,"") + ;; +esac + dnl ** Which nm to use? dnl -------------------------------------------------------------- FP_ARG_WITH_PATH_GNU_PROG([NM], [nm]) @@ -541,7 +567,7 @@ AC_PATH_PROG(TimeCmd,time) dnl ** check for tar dnl if GNU tar is named gtar, look for it first. -AC_PATH_PROGS(TarCmd,gtar tar,tar) +AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar) dnl ** check for patch dnl if GNU patch is named gpatch, look for it first