Preliminary migration to ocamlbuild.

[tatoo.git] / configure.in

diff --git a/configure.in b/configure.in
index 5bcb4c0..1fc73cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -168,10 +168,8 @@ fi
 
 #compilation options
 #debugging mode
-OCAMLFLAGS=$OCAMLFLAGS
 CAMLP4FLAGS=$CAMLP4FLAGS
-OCAMLCFLAGS=$OCAMLCFLAGS
-OCAMLOPTFLAGS=$OCAMLOPTFLAGS
+OCAMLBUILDFLAGS=$OCAMLBUILDFLAGS
 
 AC_ARG_ENABLE([debug],
               [  --enable-debug          build in debug mode],
@@ -179,8 +177,8 @@ AC_ARG_ENABLE([debug],
               [DEBUG=no])
 
 if test "x$DEBUG" = "xyes"; then
-   OCAMLFLAGS="$OCAMLFLAGS -g"
-   CAMLP4FLAGS="$CAMLP4FLAGS -DDEBUG"
+   OCAMLBUILDFLAGS="$OCAMLBUILDFLAGS -tag debug"
+   CAMLP4FLAGS="$CAMLP4FLAGS -D DEBUG"
 fi
 
 #profiling
@@ -190,7 +188,7 @@ AC_ARG_ENABLE([profile],
               [PROFILE=no])
 
 if test "x$PROFILE" = "xyes"; then
-   OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p"
+   OCAMLBUILDFLAGS="$OCAMLBUILDFLAGS -tag profile"
    OCAMLC="$OCAMLFIND ocamlcp"
 fi
 
@@ -201,7 +199,7 @@ AC_ARG_ENABLE([trace],
               [TRACE=no])
 
 if test "x$TRACE" = "xyes"; then
-   CAMLP4FLAGS="$CAMLP4FLAGS -DHTMLTRACE"
+   CAMLP4FLAGS="$CAMLP4FLAGS -D HTMLTRACE"
 fi
 
 #inlining
@@ -222,40 +220,9 @@ if test "x$UNSAFE" = "xyes"; then
 fi
 
 
-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 > "$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 > "$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(OCAMLBUILDFLAGS)
 AC_SUBST(CAMLP4FLAGS)
-AC_CONFIG_FILES(Remakefile)
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT