This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch upstream in repository ocamlnet.
commit 997ca6ad54b7c03ab0d2c83f9fc91adffbab6dee Author: Stephane Glondu <st...@glondu.net> Date: Sat Nov 9 12:27:45 2013 +0100 Imported Upstream version 3.7.2 --- configure | 20 ++++++++++---------- src/netsys/Makefile | 2 +- src/netsys/Makefile.pre | 4 +++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 1b22984..253a802 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# $Id: configure 1892 2013-08-30 17:30:57Z gerd $ +# $Id: configure 1896 2013-08-30 18:18:28Z gerd $ ####################################################################### # Helpers: @@ -67,7 +67,7 @@ set_defaults () { ocamlc=`get_path ocamlc` set_defaults -version="3.7.0" +version="3.7.2" exec_suffix="" path_sep=":" @@ -917,6 +917,14 @@ pkglist="netsys netshm netstring equeue shell netgssapi rpc-generator rpc rpc-au full_pkglist="$pkglist netstring-pcre rpc-auth-local rpc-xti equeue-tcl equeue-gtk1 equeue-gtk2 equeue-ssl rpc-ssl rpc-auth-dh nethttpd nethttpd-for-netcgi2 netzip netcgi2-apache netmech-scram" +if [ $enable_camlbox -gt 0 ]; then + pkglist="$pkglist netcamlbox" +fi + +if [ $enable_multicore -gt 0 ]; then + pkglist="$pkglist netmulticore" +fi + if [ $disable_core -gt 0 ]; then # Omit the core packages: pkglist="" @@ -950,14 +958,6 @@ if [ $with_nethttpd -gt 0 ]; then pkglist="$pkglist nethttpd-for-netcgi2" fi -if [ $enable_camlbox -gt 0 ]; then - pkglist="$pkglist netcamlbox" -fi - -if [ $enable_multicore -gt 0 ]; then - pkglist="$pkglist netmulticore" -fi - ###################################################################### # Write Makefile.conf diff --git a/src/netsys/Makefile b/src/netsys/Makefile index 34951bb..adee57d 100644 --- a/src/netsys/Makefile +++ b/src/netsys/Makefile @@ -55,7 +55,7 @@ OCAMLOPT_OPTIONS_FOR_netsys_posix.ml = $(OCAMLC_OPTIONS_FOR_netsys_posix.ml) OCAMLDEP_OPTIONS = -package "camlp4.macro" -syntax camlp4o -INSTALL_EXTRA += netsys_c_event.h +INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT) include $(TOP_DIR)/Makefile.rules diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre index e00996e..f4c849b 100644 --- a/src/netsys/Makefile.pre +++ b/src/netsys/Makefile.pre @@ -8,7 +8,9 @@ INSTALL_EXTRA = netsys_oothr.cmo \ netsys_oothr_mt_init.cmx netsys_oothr_mt_init.o \ netsys_oothr_mt_init.p.cmx netsys_oothr_mt_init.p.o \ netsys_gprof_init.p.cmx netsys_gprof_init.p.o \ - netsys_c_gprof.o + netsys_c_gprof.o \ + netsys_c_event.h \ + netsys_c_outofheap.o OCAMLDEP_OPTIONS = -package "camlp4.macro" -syntax camlp4o -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits