Don't needlessly run the last bottom-up phase, when the top-down is sufficient.

[tatoo.git] / configure.in

diff --git a/configure.in b/configure.in
index 478a416..e9f3036 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,8 @@ AC_ARG_ENABLE([inline],
               [INLINE=$enableval],
               [INLINE=100])
 
+OCAMLOPTFLAGS="$OCAMLOPTFLAGS -inline $INLINE"
+
 #unsafe
 AC_ARG_ENABLE([unsafe],
               [  --enable-unsafe         use unsafe array and string accesses],
@@ -228,16 +230,24 @@ AC_PROG_CXX()
 AC_SUBST([REMAKE], [./remake$EXE])
 if test ! -x  "$REMAKE" -o "$REMAKE" -ot remake.cpp; then
 AC_MSG_NOTICE([creating $REMAKE])
+REMAKE_LOG=build_remake.log
 case $(uname -s) in
 MINGW*)
-        $CXX -Wall -O2 -o remake.exe remake.cpp -lws2_32
-        if test $? != 0; then AC_MSG_FAILURE([failed]); fi
+        $CXX -Wall -O2 -o remake.exe remake.cpp -lws2_32 > "$REMAKE_LOG" 2>&1
+        if test $? != 0; then
+          cat "$REMAKE_LOG"; rm -f "$REMAKE_LOG";
+          AC_MSG_FAILURE([failed]);
+       fi
         ;;
 *)
-        $CXX -Wall -O2 -o remake remake.cpp
-        if test $? != 0; then AC_MSG_FAILURE([failed]); fi
+        $CXX -Wall -O2 -o remake remake.cpp > "$REMAKE_LOG" 2>&1
+        if test $? != 0; then
+          cat "$REMAKE_LOG"; rm -f "$REMAKE_LOG";
+          AC_MSG_FAILURE([failed]);
+       fi
         ;;
 esac
+rm -f "$REMAKE_LOG";
 else
 AC_MSG_NOTICE([$REMAKE exists, not rebuilding])
 fi