Merge remote-tracking branch 'upstream/master' into OCaml-make-j-race-conds

Examples/test-suite/ocaml/Makefile.in

@@ -5,6 +5,7 @@
 LANGUAGE     = ocaml
 OCAMLP4WHERE =`$(COMPILETOOL) @CAMLP4@ -where`
 OCC          =$(COMPILETOOL) @OCAMLC@
+OCAMLPP      = -pp "camlp4o ./swigp4.cmo"
 VARIANT      = _static
 SCRIPTSUFFIX = _runme.ml
 
@@ -54,7 +55,7 @@ run_testcase = \
 		if [ $(srcdir) != . ]; then \
 			cp $(srcdir)/$(ml_runme) $(ml_runme); \
 		fi ; \
-		$(OCC) -c $(ml_runme) && \
+		$(OCC) $(OCAMLPP) -c $(ml_runme) && \
 		if [ -f $(top_srcdir)/Examples/test-suite/$*.list ]; then \
 			$(OCC) swig.cmo -custom -g -cc '$(CXX)' -o $*_runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& $(RUNTOOL) ./$*_runme; \
 		else \