Bug#583265: ocaml.m4: cross-compilation still chooses build system tools instead of host tools

[Török Edwin <edwintorok@gmail.com>]

Package: ocaml-tools
Version: 20090719-1
Severity: normal

Debian has both ocamlc and ocamlc.opt. Configure (built using ocaml.m4 from
ocaml-tools) correctly finds the location of ocamlc, and others, however it
OVERRIDES them with the ocamlc.opt executables.
These are host executables (they lack the cross prefix too), and there is no
.opt variant for the i586-mingw32msvc target.
Configure shouldn't override an ocamlc/ocamlopt it has found for one target
(i586-mingw32msvc) with an ocamlc.opt/ocamlopt.opt it has found for another
target (Debian x86_64-linux-gnu).

To reproduce:
./configure --host=i586-mingw32msvc --target=i586-mingw32msvc --build=x86_64-linux-gnu
checking for i586-mingw32msvc-ocamlc... i586-mingw32msvc-ocamlc
OCaml version is 3.11.2
OCaml library path is /usr/i586-mingw32msvc/lib/ocaml
checking for i586-mingw32msvc-ocamlopt... i586-mingw32msvc-ocamlopt
checking for i586-mingw32msvc-ocamlc.opt... no
checking for ocamlc.opt... ocamlc.opt
configure: WARNING: using cross tools not prefixed with host triplet
checking for i586-mingw32msvc-ocamlopt.opt... no
checking for ocamlopt.opt... ocamlopt.opt
checking for i586-mingw32msvc-ocaml... no
checking for ocaml... ocaml
checking for i586-mingw32msvc-ocamldep... i586-mingw32msvc-ocamldep
checking for i586-mingw32msvc-ocamlmktop... i586-mingw32msvc-ocamlmktop
checking for i586-mingw32msvc-ocamlmklib... i586-mingw32msvc-ocamlmklib
checking for i586-mingw32msvc-ocamldoc... no
checking for ocamldoc... ocamldoc
checking for i586-mingw32msvc-ocamlbuild... no
checking for ocamlbuild... ocamlbuild
checking for i586-mingw32msvc-ocamllex... no
checking for ocamllex... ocamllex
checking for i586-mingw32msvc-ocamllex.opt... no
checking for ocamllex.opt... ocamllex.opt
configure: creating ./config.status
config.status: creating Makefile

Files: configure.ac:
AC_INIT(ocaml-autoconf-example,1.0)

AC_PROG_OCAML
if test "$OCAMLC" = "no"; then
  AC_MSG_ERROR([Please install the OCaml compiler])
fi

if test "$OCAMLBUILD" = "no"; then
  AC_MSG_ERROR([Please install ocamlbuild])
fi

AC_PROG_OCAMLLEX

if test "$OCAMLLEX" = "no"; then
    AC_MSG_ERROR([Please install ocamllex])
fi

AC_SUBST([OCAMLBUILD])
AC_SUBST([OCAMLC])
AC_SUBST([OCAMLOPT])
AC_SUBST([OCAMLDEP])
AC_SUBST([OCAMLLEX])
if test "$OCAMLBEST" = "opt"; then
    AC_SUBST([OCAMLBEST], [native])
else
    AC_SUBST([OCAMLBEST], [byte])
fi

AC_CONFIG_FILES([Makefile])
AC_OUTPUT

Makefile.in:
OCAMLBUILD=@OCAMLBUILD@ -ocamlc @OCAMLC@ -ocamlopt @OCAMLOPT@ -ocamldep @OCAMLDEP@ -ocamllex @OCAMLLEX@
all:
	$(OCAMLBUILD) test.@OCAMLBEST@ $(MAKEFLAGS)
clean:
	$(OCAMLBUILD) -clean

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.34-rc5-00118-gf259493 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

ocaml-tools depends on no packages.

Versions of packages ocaml-tools recommends:
ii  vim          2:7.2.436+hg~e12b9d992389-1 Vi IMproved - enhanced vi editor
ii  vim-addon-ma 0.4.3                       manager of addons for the Vim edit
ii  vim-gnome [v 2:7.2.436+hg~e12b9d992389-1 Vi IMproved - enhanced vi editor -

Versions of packages ocaml-tools suggests:
ii  autoconf                      2.65-4     automatic configure script builder
ii  otags                         3.09.3-4   tool for building TAGS files from 

-- no debconf information