X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=3c945a452375fe010484cca25164cc0024b5f4ec;hb=30b24ded6ed997a892bb62cbf1479ef047fbac01;hp=276804f4b24916e33e973e01e1b45487ad2b0f6d;hpb=d2f7d10f15a70574bceb690d26bc1f397d9806ca;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 276804f..3c945a4 100644
--- a/configure.in
+++ b/configure.in
@@ -386,7 +386,8 @@ AC_ARG_WITH(gcc,
 [  --with-gcc=<gcc command>
         Use a different command instead of 'gcc' for the GNU C compiler.
 ],
-[WhatGccIsCalled="$withval"],
+[WhatGccIsCalled="$withval"
+ CC="$withval"],
 [WhatGccIsCalled="gcc"]
 )
 AC_SUBST(WhatGccIsCalled)
@@ -428,20 +429,6 @@ if test x"$EnableWin32DLLs" = "xYES" ; then
  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 fi
 
-dnl ** Building a Win32-friendlier compiler?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(minimal-unix-deps,
-[  --enable-minimal-unix-deps
-        Build a compiler that minimizes dependencies on Unix-like tools
-	under Win32, allowing the user to operate the compiler without
-	having to install Cygwin toolchain (say). (You still need
-	that toolchain to build GHC from sources though).
-],
-[MinimalUnixDeps=YES],
-[MinimalUnixDeps=NO]
-)
-AC_SUBST(MinimalUnixDeps)
-
 dnl ** Enable the building of the OpenGL/GLUT binding in hslibs?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hopengl,
@@ -511,7 +498,6 @@ esac
 dnl ** does #! path/to/perl work? (sometimes it's too long...)
 FPTOOLS_SHEBANG_PERL
 
-
 dnl ** look for GCC and find out which version
 dnl     Figure out which C compiler to use.  Gcc is preferred.
 dnl     If gcc, make sure it's at least 2.1
@@ -519,26 +505,17 @@ dnl
 AC_PROG_CC
 FPTOOLS_HAVE_GCC
 
-dnl ** does the C compiler support option -mwin32 ?
-FPTOOLS_CC_MWIN32
-
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
 
-case $HostOS_CPP in
-cygwin32|mingw32)
-   STD_CC_OPTS="-O -mno-cygwin $CC_MWIN32_FLAG"
-   CPP="$CPP $STD_CC_OPTS"
-   CFLAGS="$STD_CC_OPTS $CFLAGS"
-   CPPFLAGS="$STD_CC_OPTS $CPPFLAGS"
-   ;;
-*)
-   STD_CC_OPTS=""
-   ;;
-esac
-SRC_CC_OPTS="-O $STD_CC_OPTS"
-AC_SUBST(SRC_CC_OPTS)
+dnl ** does the C compiler support the following options?
+FPTOOLS_CC_FLAG(-mwin32,CC_SUPPORTS_MWIN32)
+FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN)
 
+EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $CC_SUPPORTS_MWIN32"
+SRC_CC_OPTS="-O $EXTRA_CC_OPTS"
+CPPFLAGS="$EXTRA_CC_OPTS $CPPFLAGS"
+AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
@@ -588,10 +565,18 @@ 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 /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
+                        /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl glafp-utils/docbook/CATALOG*)
 if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
+case $HostOS_CPP in
+   mingw32)
+      Catalog=`cygpath -w $hardtop/$Catalog`
+      ;;
+   *)
+      Catalog=$hardtop/$Catalog
+      ;;
+esac   
 AC_SUBST(Catalog)
 
 compress_nm=`basename $CompressCmd`