Commit 8ea838b5 authored by POGODALLA Sylvain's avatar POGODALLA Sylvain

Dypgen version taken into account in configuration

parent 7ec7a337
......@@ -43,22 +43,29 @@ if test "$OCAMLDEP" = no ; then
AC_MSG_ERROR(Cannot find ocamldep.)
fi
# Look for camllex and camlyacc
# Look for camllex
AC_CHECK_PROGS(OCAMLLEX,ocamllex.opt ocamllex,no)
if test "$OCAMLLEX" = no ; then
AC_MSG_ERROR(Cannot find ocamllex)
fi
#AC_CHECK_PROG(OCAMLYACC,ocamlyacc,ocamlyacc,no)
#if test "$OCAMLYACC" = no ; then
# AC_MSG_ERROR(Cannot find ocamlyacc)
#fi
#Look for dypgen
DYPGEN_NEEDED=20080204
AC_CHECK_PROGS(DYPGEN,dypgen.opt dypgen,no)
if test "$DYPGEN" = no ; then
AC_MSG_ERROR(Cannot find dypgen)
else
DYPGEN_VERSION=`$DYPGEN --version | grep version | sed 's/^.* \(.*\)$/\1/'`
AC_MSG_CHECKING([for $DYPGEN version])
if test $DYPGEN_VERSION -ge $DYPGEN_NEEDED ; then
AC_MSG_RESULT($DYPGEN ($DYPGEN_VERSION) is ok)
else
AC_MSG_ERROR($DYPGEN version $DYPGEN_VERSION found ; version $DYPGEN_NEEDED or greater is needed)
fi
fi
# What is the OCAML version ?
# we extract Ocaml version number
OCAML_VERSION=`$OCAMLC -version`
......
......@@ -1926,7 +1926,7 @@ echo "$as_me: error: Cannot find ocamldep." >&2;}
{ (exit 1); exit 1; }; }
fi
# Look for camllex and camlyacc
# Look for camllex
for ac_prog in ocamllex.opt ocamllex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -1976,11 +1976,8 @@ echo "$as_me: error: Cannot find ocamllex" >&2;}
{ (exit 1); exit 1; }; }
fi
#AC_CHECK_PROG(OCAMLYACC,ocamlyacc,ocamlyacc,no)
#if test "$OCAMLYACC" = no ; then
# AC_MSG_ERROR(Cannot find ocamlyacc)
#fi
#Look for dypgen
DYPGEN_NEEDED=20080204
for ac_prog in dypgen.opt dypgen
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -2028,8 +2025,22 @@ if test "$DYPGEN" = no ; then
{ { echo "$as_me:$LINENO: error: Cannot find dypgen" >&5
echo "$as_me: error: Cannot find dypgen" >&2;}
{ (exit 1); exit 1; }; }
else
DYPGEN_VERSION=`$DYPGEN --version | grep version | sed 's/^.* \(.*\)$/\1/'`
{ echo "$as_me:$LINENO: checking for $DYPGEN version" >&5
echo $ECHO_N "checking for $DYPGEN version... $ECHO_C" >&6; }
if test $DYPGEN_VERSION -ge $DYPGEN_NEEDED ; then
{ echo "$as_me:$LINENO: result: $DYPGEN ($DYPGEN_VERSION) is ok" >&5
echo "${ECHO_T}$DYPGEN ($DYPGEN_VERSION) is ok" >&6; }
else
{ { echo "$as_me:$LINENO: error: $DYPGEN version $DYPGEN_VERSION found ; version $DYPGEN_NEEDED or greater is needed" >&5
echo "$as_me: error: $DYPGEN version $DYPGEN_VERSION found ; version $DYPGEN_NEEDED or greater is needed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
# What is the OCAML version ?
# we extract Ocaml version number
OCAML_VERSION=`$OCAMLC -version`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment