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

diff --git a/configure.in b/configure.in
index 1fc73cf..0adc970 100644
--- a/configure.in
+++ b/configure.in
@@ -90,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])
@@ -178,7 +179,7 @@ AC_ARG_ENABLE([debug],
 
 if test "x$DEBUG" = "xyes"; then
    OCAMLBUILDFLAGS="$OCAMLBUILDFLAGS -tag debug"
-   CAMLP4FLAGS="$CAMLP4FLAGS -D DEBUG"
+   CAMLP4FLAGS="$CAMLP4FLAGS ppopt\(-D\) ppopt\(DEBUG\)"
 fi
 
 #profiling
@@ -199,7 +200,7 @@ AC_ARG_ENABLE([trace],
               [TRACE=no])
 
 if test "x$TRACE" = "xyes"; then
-   CAMLP4FLAGS="$CAMLP4FLAGS -D HTMLTRACE"
+   CAMLP4FLAGS="$CAMLP4FLAGS ppopt\(-D\) ppopt\(HTMLTRACE\)"
 fi
 
 #inlining
@@ -216,7 +217,7 @@ AC_ARG_ENABLE([unsafe],
               [UNSAFE=0])
 
 if test "x$UNSAFE" = "xyes"; then
-   CAMLP4FLAGS="$CAMLP4FLAGS -unsafe"
+   CAMLP4FLAGS="$CAMLP4FLAGS ppopt\(-unsafe\)"
 fi