Fix configuration of OCaml 4.08+

Author: dra27

appveyor_build.sh

@@ -15,15 +15,29 @@ function run {
 }
 
 function configure_ocaml {
-    cp config/m-nt.h $HEADER_DIR/m.h
-    cp config/s-nt.h $HEADER_DIR/s.h
-
-    sed -e "s|PREFIX=.*|PREFIX=$OCAMLROOT|" \
-        -e "s|OTHERLIBRARIES=.*|OTHERLIBRARIES=|" \
-        -e "s|WITH_DEBUGGER=.*|WITH_DEBUGGER=|" \
-        -e "s|WITH_OCAMLDOC=.*|WITH_OCAMLDOC=|" \
-        config/Makefile.msvc64 > $CONFIG_DIR/Makefile
-    #run "Content of config/Makefile" cat $CONFIG_DIR/Makefile
+    if [[ -z $HEADER_DIR ]] ; then
+      ./configure --build=i686-pc-cygwin --host=x86_64-pc-windows \
+                    --prefix=$OCAMLROOT \
+                    --disable-debugger \
+                    --disable-ocamldoc \
+                    --disable-systhreads \
+                    --disable-str-lib \
+                    --disable-unix-lib \
+                    --disable-bigarray-lib \
+                    --disable-graph-lib \
+                    --disable-debug-runtime
+    else
+      # "Classic" configuration
+      cp config/m-nt.h $HEADER_DIR/m.h
+      cp config/s-nt.h $HEADER_DIR/s.h
+
+      sed -e "s|PREFIX=.*|PREFIX=$OCAMLROOT|" \
+          -e "s|OTHERLIBRARIES=.*|OTHERLIBRARIES=|" \
+          -e "s|WITH_DEBUGGER=.*|WITH_DEBUGGER=|" \
+          -e "s|WITH_OCAMLDOC=.*|WITH_OCAMLDOC=|" \
+          config/Makefile.msvc64 > $CONFIG_DIR/Makefile
+      #run "Content of config/Makefile" cat $CONFIG_DIR/Makefile
+    fi
 }
 
 echo ** OCAMLROOT=$OCAMLROOT
@@ -49,7 +63,7 @@ cd ocaml
 
 MAKEOCAML=make
 CONFIG_DIR=config
-HEADER_DIR=runtime/caml
+HEADER_DIR=
 
 case $OCAMLBRANCH in
     4.03|4.04)