X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=configure.in;h=0de71a1d2c08d656fea6bd3014ffb68ede3d5cd4;hp=34a9e31f994106f9e0bdc34652b48133acb87ca2;hb=HEAD;hpb=91d60f0cf46661abde8df94fead3688ec43a2db9

diff --git a/configure.in b/configure.in
index 34a9e31..0de71a1 100644
--- a/configure.in
+++ b/configure.in
@@ -68,50 +68,49 @@ esac
 
 AC_SUBST(OCAMLVERSION)
 
-dnl ocamlyacc and ocamllex are not needed
 #detect ocamlyacc
-dnl OCAMLYACC=ocamlyacc
-dnl AC_ARG_WITH([ocamlyacc],
-dnl             AS_HELP_STRING([--with-ocamlyacc=PATH], [location of the ocamlyacc binary]),
-dnl         [OCAMLYACC="$withval"])
-dnl AC_MSG_CHECKING([for ocamlyacc ($OCAMLYACC)])
-dnl OCAMLYACC_VERSION=$($OCAMLYACC -version 2>/dev/null || echo foo)
-dnl case "$OCAMLYACC_VERSION" in
-dnl      *$OCAMLVERSION)
-dnl      AC_MSG_RESULT([ok])
-dnl      ;;
-dnl      foo)
-dnl      AC_MSG_RESULT([failed])
-dnl      AC_MSG_ERROR([Cannot find ocamlyacc])
-dnl      ;;
-dnl      *)
-dnl      AC_MSG_RESULT([failed])
-dnl      AC_MSG_ERROR([Bad ocamlyacc version])
-dnl      ;;
-dnl esac
-dnl AC_SUBST([OCAMLYACC])
-
-dnl #detect ocamllex
-dnl OCAMLLEX=ocamllex
-dnl AC_ARG_WITH([ocamllex],
-dnl             AS_HELP_STRING([--with-ocamllex=PATH], [location of the ocamllex binary]),
-dnl         [OCAMLLEX="$withval"])
-dnl AC_MSG_CHECKING([for ocamllex ($OCAMLLEX)])
-dnl OCAMLLEX_VERSION=$($OCAMLLEX -version 2>/dev/null || echo foo)
-dnl case "$OCAMLLEX_VERSION" in
-dnl      *$OCAMLVERSION)
-dnl      AC_MSG_RESULT([ok])
-dnl      ;;
-dnl      foo)
-dnl      AC_MSG_RESULT([failed])
-dnl      AC_MSG_ERROR([Cannot find ocamllex])
-dnl      ;;
-dnl      *)
-dnl      AC_MSG_RESULT([failed])
-dnl      AC_MSG_ERROR([Bad ocamllex version])
-dnl      ;;
-dnl esac
-dnl AC_SUBST([OCAMLLEX])
+OCAMLYACC=ocamlyacc
+AC_ARG_WITH([ocamlyacc],
+            AS_HELP_STRING([--with-ocamlyacc=PATH], [location of the ocamlyacc binary]),
+        [OCAMLYACC="$withval"])
+AC_MSG_CHECKING([for ocamlyacc ($OCAMLYACC)])
+OCAMLYACC_VERSION=$($OCAMLYACC -version 2>/dev/null || echo foo)
+case "$OCAMLYACC_VERSION" in
+     *$OCAMLVERSION)
+     AC_MSG_RESULT([ok])
+     ;;
+     foo)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Cannot find ocamlyacc])
+     ;;
+     *)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Bad ocamlyacc version])
+     ;;
+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
+     *$OCAMLVERSION)
+     AC_MSG_RESULT([ok])
+     ;;
+     foo)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Cannot find ocamllex])
+     ;;
+     *)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Bad ocamllex version])
+     ;;
+esac
+AC_SUBST([OCAMLLEX])
 
 
 #detect camlp4
@@ -158,32 +157,6 @@ else
    AC_MSG_ERROR([Cannot find ulex.])
 fi
 
-
-MENHIR=menhir
-AC_ARG_WITH([menhir],
-            AS_HELP_STRING([--with-menhir=PATH], [location of the menhir binary]),
-	    [MENHIR="$withval"])
-
-AC_MSG_CHECKING([for menhir ($MENHIR)])
-
-MENHIR_VERSION=$($MENHIR --version 2>/dev/null || echo not_found)
-MENHIR_VERSION=$(echo "$MENHIR_VERSION" | cut -f 2- -d ',' | cut -f 2- -d ' ')
-case "$MENHIR_VERSION" in
-      'version 201'[[0-9]]*)
-      AC_MSG_RESULT([ok (${MENHIR_VERSION})])
-     ;;
-      not_found)
-      AC_MSG_RESULT([failed])
-      AC_MSG_ERROR([Cannot find menhir])
-     ;;
-     *)
-     AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Your version of  menhir is too old (${MENHIR_VERSION})])
-     ;;
-esac
-AC_SUBST([MENHIR])
-
-
 AC_MSG_CHECKING([for expat])
 expat_path=`$OCAMLFIND query expat 2>/dev/null`
 if test "$expat_path" ; then
@@ -195,7 +168,7 @@ fi
 
 #compilation options
 #debugging mode
-OCAMLFLAGS=$OCAMLFLAGS
+OCAMLFLAGS="-principal -warn-error @3 $OCAMLFLAGS"
 CAMLP4FLAGS=$CAMLP4FLAGS
 OCAMLCFLAGS=$OCAMLCFLAGS
 OCAMLOPTFLAGS=$OCAMLOPTFLAGS
@@ -217,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
 
@@ -238,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
 
@@ -277,12 +251,10 @@ 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