X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=dd732265b6878ea633ac3dfc54792f3e5055ce24;hb=361f4ed564df9b6d1f93a24e84408bd277a5be41;hp=be31d6907f3dc9ae5eb61c71a50ed5821cc1d8b0;hpb=a76dd9ee7fc30bd67ac21acf24e3f6adf40c59c3;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index be31d69..dd73226 100644
--- a/configure.in
+++ b/configure.in
@@ -202,12 +202,6 @@ i[[3456]]86-*-mingw32*)
         HostVendor_CPP='unknown'
         HostOS_CPP='mingw32'
 	exeext='.exe'
-	# We assume you're using mingw32 via the gcc that comes
-	# with cygwin, and not the native port, so let's augment
-	# the gcc command-line used here with -mno-cygwin -mwin32
-	# to arrange for good things to happen.
-	CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
-	CPPFLAGS="-mno-cygwin -mwin32 $CPPFLAGS"
         ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
@@ -478,6 +472,8 @@ AC_ARG_WITH(glut-xlib,
 test -n "$with_glut_xlib" && CPPFLAGS="$CPPFLAGS -DGLUT_XLIB_IMPLEMENTATION=$with_glut_xlib"
 
 
+
+
 dnl --------------------------------------------------------------
 dnl End of configure script option section
 dnl --------------------------------------------------------------
@@ -523,13 +519,26 @@ 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
-mingw32)
-   CPP="$CPP -mno-cygwin -mwin32"
+cygwin32|mingw32)
+   STD_CC_OPTS="-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 ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
@@ -878,6 +887,12 @@ dnl ** check for math library
 FPTOOLS_CHECK_LIBM()
 AC_SUBST(LIBM)
 
+case $HostOS_CPP in
+cygwin32) ;;
+mingw32)  ;;
+*) AC_PATH_XTRA() ;;
+esac
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
@@ -947,4 +962,5 @@ FPTOOLS_END_DATA_SECTION
 dnl ** code before data?
 FPTOOLS_CODE_BEFORE_DATA
 
+
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )