better configure on Windows, thanks to Benjamin Monate

f984ada8 · Andrei Paskevich · 509cc380 · f984ada8 · f984ada8
Commit f984ada8 authored Nov 17, 2011 by Andrei Paskevich
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

Makefile.in Makefile.in +1 -0

configure.in configure.in +10 -1

No files found.
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,7 @@ EXE   = @EXE@
 STRIP = @STRIP@

 # other variables
+CC        = @CC@
 OCAMLC    = @OCAMLC@
 OCAMLOPT  = @OCAMLOPT@
 OCAMLDEP  = @OCAMLDEP@

--- a/configure.in
+++ b/configure.in
@@ -120,13 +120,22 @@ if uname -s | grep -q CYGWIN ; then
  EXE=.exe
  STRIP='echo "no strip "'
  CPULIMIT=cpulimit-win
-  AC_MSG_RESULT(.exe)
+  AC_MSG_RESULT(.exe <Cygwin>)
+else
+if uname -s | grep -q MINGW ; then
+  EXE=.exe
+  STRIP=strip
+  CPULIMIT=cpulimit-win
+  AC_MSG_RESULT(.exe <MinGW>)
 else
  EXE=
  STRIP=strip
  CPULIMIT=cpulimit
  AC_MSG_RESULT(<none>)
 fi
+fi
+
+AC_PROG_CC()

 # Check for Ocaml compilers