Module: ppl/ppl Branch: ppl-0_11-branch Commit: bd9e702efd9e166572122b2516e38c11ec928aa4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd9e702efd9e1...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sat Jan 29 19:36:24 2011 +0100

AC_PROG_OCAML only sets OCAMLOPT if OCAMLC is different from "no".

---

configure.ac | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac index 5005cca..46c51ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1018,32 +1018,32 @@ then AC_PROG_OCAML if test x"$OCAMLC" != xno then - # Check for the bytecode version of ML GMP. - AC_MSG_CHECKING([for ML GMP bytecode module gmp.cma]) - if ( test ${mlgmp_dir} = +gmp && test -f ${OCAMLLIB}/gmp/gmp.cma ) \ - || test -f ${mlgmp_dir}/gmp.cma; - then - AC_MSG_RESULT(yes) - ocamlc_gmp="yes" - else - AC_MSG_RESULT(no) - ocamlc_gmp="no" - fi - fi - if test x"$OCAMLOPT" != xno - then - ocamlopt_root=`${OCAMLOPT} -where` - # Check for the native version of ML GMP. - AC_MSG_CHECKING([for ML GMP native module gmp.cmxa]) - if ( test ${mlgmp_dir} = +gmp && test -f ${ocamlopt_root}/gmp/gmp.cmxa ) \ + # Check for the bytecode version of ML GMP. + AC_MSG_CHECKING([for ML GMP bytecode module gmp.cma]) + if ( test ${mlgmp_dir} = +gmp && test -f ${OCAMLLIB}/gmp/gmp.cma ) \ + || test -f ${mlgmp_dir}/gmp.cma; + then + AC_MSG_RESULT(yes) + ocamlc_gmp="yes" + else + AC_MSG_RESULT(no) + ocamlc_gmp="no" + fi + if test x"$OCAMLOPT" != xno + then + ocamlopt_root=`${OCAMLOPT} -where` + # Check for the native version of ML GMP. + AC_MSG_CHECKING([for ML GMP native module gmp.cmxa]) + if ( test ${mlgmp_dir} = +gmp && test -f ${ocamlopt_root}/gmp/gmp.cmxa ) \ || test -f ${mlgmp_dir}/gmp.cmxa; - then - AC_MSG_RESULT(yes) - ocamlopt_gmp="yes" - else - AC_MSG_RESULT(no) - ocamlopt_gmp="no" - fi + then + AC_MSG_RESULT(yes) + ocamlopt_gmp="yes" + else + AC_MSG_RESULT(no) + ocamlopt_gmp="no" + fi + fi fi fi AM_CONDITIONAL(HAVE_OCAMLC, test x$ocamlc_gmp = xyes)