X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=configure.in;h=0adc97018dd98f566cf6b724f27a67862f260a08;hp=fb0932705134e67509d66c951151d7cb512a4e52;hb=406c70f1fe88c94c66489604eb8337d1e54043b9;hpb=8af68de11421dacc2f77a8398dcb48c75a5ff3b1

diff --git a/configure.in b/configure.in
index fb09327..0adc970 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ AC_INIT([TAToo],
         [Kim Nguyễn <kn@lri.fr>],
         [tatoo])
 
-
 #detect ocamlfind
 OCAMLFIND=ocamlfind
 AC_ARG_WITH([ocamlfind],
@@ -91,50 +90,51 @@ case "$OCAMLYACC_VERSION" in
 esac
 AC_SUBST([OCAMLYACC])
 
-#detect ocamllex
-OCAMLLEX=ocamllex
-AC_ARG_WITH([ocamllex],
-            AS_HELP_STRING([--with-ocamllex=PATH], [location of the ocamllex binary]),
-        [OCAMLLEX="$withval"])
-AC_MSG_CHECKING([for ocamllex ($OCAMLLEX)])
-OCAMLLEX_VERSION=$($OCAMLLEX -version 2>/dev/null || echo foo)
-case "$OCAMLLEX_VERSION" in
+
+#detect camlp4
+CAMLP4=camlp4
+AC_ARG_WITH([camlp4],
+            AS_HELP_STRING([--with-camlp4=PATH], [location of the camlp4 binary]),
+        [CAMLP4="$withval"])
+AC_MSG_CHECKING([for camlp4 ($CAMLP4)])
+CAMLP4_VERSION=$($CAMLP4 -version 2>/dev/null || echo foo)
+case "$CAMLP4_VERSION" in
      *$OCAMLVERSION)
      AC_MSG_RESULT([ok])
      ;;
      foo)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Cannot find ocamllex])
+     AC_MSG_ERROR([Cannot find camlp4])
      ;;
      *)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Bad ocamllex version])
+     AC_MSG_ERROR([Bad camlp4 version])
      ;;
 esac
-AC_SUBST([OCAMLLEX])
-
+AC_SUBST([CAMLP4])
 
-#detect camlp4
-CAMLP4=camlp4
-AC_ARG_WITH([camlp4],
-            AS_HELP_STRING([--with-camlp4=PATH], [location of the camlp4 binary]),
+#detect ocamlbuild
+OCAMLBUILD=ocamlbuild
+AC_ARG_WITH([ocamlbuild],
+            AS_HELP_STRING([--with-ocamlbuild=PATH], [location of the ocamlbuild binary]),
         [CAMLP4="$withval"])
-AC_MSG_CHECKING([for camlp4 ($CAMLP4)])
-CAMLP4_VERSION=$($CAMLP4 -version 2>/dev/null || echo foo)
+AC_MSG_CHECKING([for ocamlbuild ($OCAMLBUILD)])
+OCAMLBUILD_VERSION=$($OCAMLBUILD -version 2>/dev/null || echo foo)
 case "$CAMLP4_VERSION" in
      *$OCAMLVERSION)
      AC_MSG_RESULT([ok])
      ;;
      foo)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Cannot find camlp4])
+     AC_MSG_ERROR([Cannot find ocamlbuild])
      ;;
      *)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Bad camlp4 version])
+     AC_MSG_ERROR([Bad ocamlbuild version])
      ;;
 esac
-AC_SUBST([CAMLP4])
+AC_SUBST([OCAMLBUILD])
+
 
 # platform
 AC_MSG_CHECKING([platform])
@@ -150,8 +150,8 @@ AC_SUBST(EXE)
 
 # required libraries
 AC_MSG_CHECKING([for ulex])
-$OCAMLFIND query ulex >/dev/null 2>&1
-if test $? ; then
+ulex_path=`$OCAMLFIND query ulex 2>/dev/null`
+if test "$ulex_path" ; then
    AC_MSG_RESULT([found])
 else
    AC_MSG_RESULT([not found])
@@ -159,20 +159,18 @@ else
 fi
 
 AC_MSG_CHECKING([for expat])
-$OCAMLFIND query ulex >/dev/null 2>&1
-if test $? ; then
+expat_path=`$OCAMLFIND query expat 2>/dev/null`
+if test "$expat_path" ; then
    AC_MSG_RESULT([found])
 else
    AC_MSG_RESULT([not found])
-   AC_MSG_ERROR([Cannot find ulex.])
+   AC_MSG_ERROR([Cannot find expat.])
 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],
@@ -180,8 +178,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 ppopt\(-D\) ppopt\(DEBUG\)"
 fi
 
 #profiling
@@ -191,7 +189,7 @@ AC_ARG_ENABLE([profile],
               [PROFILE=no])
 
 if test "x$PROFILE" = "xyes"; then
-   OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p"
+   OCAMLBUILDFLAGS="$OCAMLBUILDFLAGS -tag profile"
    OCAMLC="$OCAMLFIND ocamlcp"
 fi
 
@@ -202,7 +200,7 @@ AC_ARG_ENABLE([trace],
               [TRACE=no])
 
 if test "x$TRACE" = "xyes"; then
-   CAMLP4FLAGS="$CAMLP4FLAGS -DHTMLTRACE"
+   CAMLP4FLAGS="$CAMLP4FLAGS ppopt\(-D\) ppopt\(HTMLTRACE\)"
 fi
 
 #inlining
@@ -219,35 +217,13 @@ AC_ARG_ENABLE([unsafe],
               [UNSAFE=0])
 
 if test "x$UNSAFE" = "xyes"; then
-   CAMLP4FLAGS="$CAMLP4FLAGS -unsafe"
+   CAMLP4FLAGS="$CAMLP4FLAGS ppopt\(-unsafe\)"
 fi
 
 
-AC_PROG_CXX()
-
-
-AC_SUBST([REMAKE], [./remake$EXE])
-if test ! -x  "$REMAKE" -o "$REMAKE" -ot remake.cpp; then
-AC_MSG_NOTICE([creating $REMAKE])
-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 remake.cpp
-        if test $? != 0; then AC_MSG_FAILURE([failed]); fi
-        ;;
-esac
-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