Add a new option to choose tree model at runtime.

[tatoo.git] / configure.in

diff --git a/configure.in b/configure.in
index 478a416..0de71a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -168,7 +168,7 @@ fi
 
 #compilation options
 #debugging mode
-OCAMLFLAGS=$OCAMLFLAGS
+OCAMLFLAGS="-principal -warn-error @3 $OCAMLFLAGS"
 CAMLP4FLAGS=$CAMLP4FLAGS
 OCAMLCFLAGS=$OCAMLCFLAGS
 OCAMLOPTFLAGS=$OCAMLOPTFLAGS
@@ -190,7 +190,7 @@ AC_ARG_ENABLE([profile],
               [PROFILE=no])
 
 if test "x$PROFILE" = "xyes"; then
-   OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p"
+   OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p -ccopt -no-pie"
    OCAMLC="$OCAMLFIND ocamlcp"
 fi
 
@@ -211,13 +211,14 @@ 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],
               [UNSAFE=1],
               [UNSAFE=0])
 
-if test "x$UNSAFE" = "xyes"; then
+if test "x$UNSAFE" = "x1"; then
    CAMLP4FLAGS="$CAMLP4FLAGS -unsafe"
 fi
 
@@ -228,26 +229,32 @@ 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
 
-
-AC_SUBST(INLINE)
 AC_SUBST(OCAMLFLAGS)
 AC_SUBST(OCAMLCFLAGS)
 AC_SUBST(OCAMLOPTFLAGS)
 AC_SUBST(CAMLP4FLAGS)
-AC_CONFIG_FILES(Remakefile)
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile Remakefile)
+
 AC_OUTPUT