Small corrections + missing files
This commit is contained in:
Cédric Pasteur
parent
a6f1d2f073
commit
14e7c21e54
4 changed files with 268 additions and 4 deletions
4
configure
vendored
4
configure
vendored
|
|
@ -3046,8 +3046,8 @@ $as_echo "not found" >&6; }
|
|||
|
||||
|
||||
if test "$OCAML_PKG_lablgtk2" = "no"; then
|
||||
enable_simulator = no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find 'lablgtk2'. The simulator will not be built" >&5
|
||||
enable_simulator=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find 'lablgtk2'. The simulator will not be built" >&5
|
||||
$as_echo "$as_me: WARNING: Could not find 'lablgtk2'. The simulator will not be built" >&2;}
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ AC_CHECK_OCAML_PKG([ocamlgraph])
|
|||
|
||||
AC_CHECK_OCAML_PKG([lablgtk2])
|
||||
if test "$OCAML_PKG_lablgtk2" = "no"; then
|
||||
enable_simulator=no
|
||||
AC_MSG_WARN([Could not find 'lablgtk2'. The simulator will not be built])
|
||||
enable_simulator=no
|
||||
AC_MSG_WARN([Could not find 'lablgtk2'. The simulator will not be built])
|
||||
fi
|
||||
|
||||
if test "$enable_local_stdlib" = "yes"; then
|
||||
|
|
|
|||
24
lib/Makefile
Normal file
24
lib/Makefile
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
include ../config
|
||||
|
||||
STDLIB_INTERFACE=pervasives.epi
|
||||
STDLIB_OBJ=$(STDLIB_INTERFACE:.epi=.epci)
|
||||
|
||||
C_DIR=C
|
||||
C_OBJ=pervasives.h
|
||||
|
||||
.SUFFIXES: .epi .epci
|
||||
|
||||
.epi.epci:
|
||||
../compiler/$(COMPILER).$(TARGET) -nopervasives $<
|
||||
|
||||
.PHONY: all install
|
||||
|
||||
all: $(STDLIB_OBJ)
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d $(INSTALL_LIBDIR)
|
||||
$(INSTALL) $(STDLIB_OBJ) $(STDLIB_INTERFACE) $(INSTALL_LIBDIR)
|
||||
$(INSTALL) -d $(INSTALL_LIBDIR)
|
||||
(cd c/; $(INSTALL) $(C_OBJ) $(INSTALL_LIBDIR)/$(C_DIR))
|
||||
|
||||
clean:
|
||||
240
m4/ocaml.m4
Normal file
240
m4/ocaml.m4
Normal file
|
|
@ -0,0 +1,240 @@
|
|||
dnl autoconf macros for OCaml
|
||||
dnl
|
||||
dnl Copyright © 2009 Richard W.M. Jones
|
||||
dnl Copyright © 2009 Stefano Zacchiroli
|
||||
dnl Copyright © 2000-2005 Olivier Andrieu
|
||||
dnl Copyright © 2000-2005 Jean-Christophe Filliâtre
|
||||
dnl Copyright © 2000-2005 Georges Mariano
|
||||
dnl
|
||||
dnl For documentation, please read the ocaml.m4 man page.
|
||||
|
||||
AC_DEFUN([AC_PROG_OCAML],
|
||||
[dnl
|
||||
# checking for ocamlc
|
||||
AC_CHECK_TOOL([OCAMLC],[ocamlc],[no])
|
||||
|
||||
if test "$OCAMLC" != "no"; then
|
||||
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p'`
|
||||
AC_MSG_RESULT([OCaml version is $OCAMLVERSION])
|
||||
# If OCAMLLIB is set, use it
|
||||
if test "$OCAMLLIB" = ""; then
|
||||
OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' ' -f 4`
|
||||
else
|
||||
AC_MSG_RESULT([OCAMLLIB previously set; preserving it.])
|
||||
fi
|
||||
AC_MSG_RESULT([OCaml library path is $OCAMLLIB])
|
||||
|
||||
AC_SUBST([OCAMLVERSION])
|
||||
AC_SUBST([OCAMLLIB])
|
||||
|
||||
# checking for ocamlopt
|
||||
AC_CHECK_TOOL([OCAMLOPT],[ocamlopt],[no])
|
||||
OCAMLBEST=byte
|
||||
if test "$OCAMLOPT" = "no"; then
|
||||
AC_MSG_WARN([Cannot find ocamlopt; bytecode compilation only.])
|
||||
else
|
||||
TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
|
||||
if test "$TMPVERSION" != "$OCAMLVERSION" ; then
|
||||
AC_MSG_RESULT([versions differs from ocamlc; ocamlopt discarded.])
|
||||
OCAMLOPT=no
|
||||
else
|
||||
OCAMLBEST=opt
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST([OCAMLBEST])
|
||||
|
||||
# checking for ocamlc.opt
|
||||
AC_CHECK_TOOL([OCAMLCDOTOPT],[ocamlc.opt],[no])
|
||||
if test "$OCAMLCDOTOPT" != "no"; then
|
||||
TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
|
||||
if test "$TMPVERSION" != "$OCAMLVERSION" ; then
|
||||
AC_MSG_RESULT([versions differs from ocamlc; ocamlc.opt discarded.])
|
||||
else
|
||||
OCAMLC=$OCAMLCDOTOPT
|
||||
fi
|
||||
fi
|
||||
|
||||
# checking for ocamlopt.opt
|
||||
if test "$OCAMLOPT" != "no" ; then
|
||||
AC_CHECK_TOOL([OCAMLOPTDOTOPT],[ocamlopt.opt],[no])
|
||||
if test "$OCAMLOPTDOTOPT" != "no"; then
|
||||
TMPVERSION=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
|
||||
if test "$TMPVERSION" != "$OCAMLVERSION" ; then
|
||||
AC_MSG_RESULT([version differs from ocamlc; ocamlopt.opt discarded.])
|
||||
else
|
||||
OCAMLOPT=$OCAMLOPTDOTOPT
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST([OCAMLOPT])
|
||||
fi
|
||||
|
||||
AC_SUBST([OCAMLC])
|
||||
|
||||
# checking for ocaml toplevel
|
||||
AC_CHECK_TOOL([OCAML],[ocaml],[no])
|
||||
|
||||
# checking for ocamldep
|
||||
AC_CHECK_TOOL([OCAMLDEP],[ocamldep],[no])
|
||||
|
||||
# checking for ocamlmktop
|
||||
AC_CHECK_TOOL([OCAMLMKTOP],[ocamlmktop],[no])
|
||||
|
||||
# checking for ocamlmklib
|
||||
AC_CHECK_TOOL([OCAMLMKLIB],[ocamlmklib],[no])
|
||||
|
||||
# checking for ocamldoc
|
||||
AC_CHECK_TOOL([OCAMLDOC],[ocamldoc],[no])
|
||||
|
||||
# checking for ocamlbuild
|
||||
AC_CHECK_TOOL([OCAMLBUILD],[ocamlbuild],[no])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AC_PROG_OCAMLLEX],
|
||||
[dnl
|
||||
# checking for ocamllex
|
||||
AC_CHECK_TOOL([OCAMLLEX],[ocamllex],[no])
|
||||
if test "$OCAMLLEX" != "no"; then
|
||||
AC_CHECK_TOOL([OCAMLLEXDOTOPT],[ocamllex.opt],[no])
|
||||
if test "$OCAMLLEXDOTOPT" != "no"; then
|
||||
OCAMLLEX=$OCAMLLEXDOTOPT
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([OCAMLLEX])
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_PROG_OCAMLYACC],
|
||||
[dnl
|
||||
AC_CHECK_TOOL([OCAMLYACC],[ocamlyacc],[no])
|
||||
AC_SUBST([OCAMLYACC])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AC_PROG_CAMLP4],
|
||||
[dnl
|
||||
AC_REQUIRE([AC_PROG_OCAML])dnl
|
||||
|
||||
# checking for camlp4
|
||||
AC_CHECK_TOOL([CAMLP4],[camlp4],[no])
|
||||
if test "$CAMLP4" != "no"; then
|
||||
TMPVERSION=`$CAMLP4 -v 2>&1| sed -n -e 's|.*version *\(.*\)$|\1|p'`
|
||||
if test "$TMPVERSION" != "$OCAMLVERSION" ; then
|
||||
AC_MSG_RESULT([versions differs from ocamlc])
|
||||
CAMLP4=no
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([CAMLP4])
|
||||
|
||||
# checking for companion tools
|
||||
AC_CHECK_TOOL([CAMLP4BOOT],[camlp4boot],[no])
|
||||
AC_CHECK_TOOL([CAMLP4O],[camlp4o],[no])
|
||||
AC_CHECK_TOOL([CAMLP4OF],[camlp4of],[no])
|
||||
AC_CHECK_TOOL([CAMLP4OOF],[camlp4oof],[no])
|
||||
AC_CHECK_TOOL([CAMLP4ORF],[camlp4orf],[no])
|
||||
AC_CHECK_TOOL([CAMLP4PROF],[camlp4prof],[no])
|
||||
AC_CHECK_TOOL([CAMLP4R],[camlp4r],[no])
|
||||
AC_CHECK_TOOL([CAMLP4RF],[camlp4rf],[no])
|
||||
AC_SUBST([CAMLP4BOOT])
|
||||
AC_SUBST([CAMLP4O])
|
||||
AC_SUBST([CAMLP4OF])
|
||||
AC_SUBST([CAMLP4OOF])
|
||||
AC_SUBST([CAMLP4ORF])
|
||||
AC_SUBST([CAMLP4PROF])
|
||||
AC_SUBST([CAMLP4R])
|
||||
AC_SUBST([CAMLP4RF])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AC_PROG_FINDLIB],
|
||||
[dnl
|
||||
AC_REQUIRE([AC_PROG_OCAML])dnl
|
||||
|
||||
# checking for ocamlfind
|
||||
AC_CHECK_TOOL([OCAMLFIND],[ocamlfind],[no])
|
||||
AC_SUBST([OCAMLFIND])
|
||||
])
|
||||
|
||||
|
||||
dnl Thanks to Jim Meyering for working this next bit out for us.
|
||||
dnl XXX We should define AS_TR_SH if it's not defined already
|
||||
dnl (eg. for old autoconf).
|
||||
AC_DEFUN([AC_CHECK_OCAML_PKG],
|
||||
[dnl
|
||||
AC_REQUIRE([AC_PROG_FINDLIB])dnl
|
||||
|
||||
AC_MSG_CHECKING([for OCaml findlib package $1])
|
||||
|
||||
unset found
|
||||
unset pkg
|
||||
found=no
|
||||
for pkg in $1 $2 ; do
|
||||
if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
|
||||
AC_MSG_RESULT([found])
|
||||
AS_TR_SH([OCAML_PKG_$1])=$pkg
|
||||
found=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "$found" = "no" ; then
|
||||
AC_MSG_RESULT([not found])
|
||||
AS_TR_SH([OCAML_PKG_$1])=no
|
||||
fi
|
||||
|
||||
AC_SUBST(AS_TR_SH([OCAML_PKG_$1]))
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AC_CHECK_OCAML_MODULE],
|
||||
[dnl
|
||||
AC_MSG_CHECKING([for OCaml module $2])
|
||||
|
||||
cat > conftest.ml <<EOF
|
||||
open $3
|
||||
EOF
|
||||
unset found
|
||||
for $1 in $$1 $4 ; do
|
||||
if $OCAMLC -c -I "$$1" conftest.ml >&5 2>&5 ; then
|
||||
found=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if test "$found" ; then
|
||||
AC_MSG_RESULT([$$1])
|
||||
else
|
||||
AC_MSG_RESULT([not found])
|
||||
$1=no
|
||||
fi
|
||||
AC_SUBST([$1])
|
||||
])
|
||||
|
||||
|
||||
dnl XXX Cross-compiling
|
||||
AC_DEFUN([AC_CHECK_OCAML_WORD_SIZE],
|
||||
[dnl
|
||||
AC_REQUIRE([AC_PROG_OCAML])dnl
|
||||
AC_MSG_CHECKING([for OCaml compiler word size])
|
||||
cat > conftest.ml <<EOF
|
||||
print_endline (string_of_int Sys.word_size)
|
||||
EOF
|
||||
OCAML_WORD_SIZE=`$OCAML conftest.ml`
|
||||
AC_MSG_RESULT([$OCAML_WORD_SIZE])
|
||||
AC_SUBST([OCAML_WORD_SIZE])
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_CHECK_OCAML_OS_TYPE],
|
||||
[dnl
|
||||
AC_REQUIRE([AC_PROG_OCAML])dnl
|
||||
AC_MSG_CHECKING([OCaml Sys.os_type])
|
||||
|
||||
cat > conftest.ml <<EOF
|
||||
print_string(Sys.os_type);;
|
||||
EOF
|
||||
|
||||
OCAML_OS_TYPE=`$OCAML conftest.ml`
|
||||
AC_MSG_RESULT([$OCAML_OS_TYPE])
|
||||
AC_SUBST([OCAML_OS_TYPE])
|
||||
])
|
||||
Loading…
Reference in a new issue