[cairo-commit] cairo-ocaml/support ocaml.m4,1.1.1.1,1.2

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/support
In directory pdx:/tmp/cvs-serv16571/support

Modified Files:
	ocaml.m4 
Log Message:
update ocaml.m4

Index: ocaml.m4
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/support/ocaml.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ocaml.m4	18 Nov 2003 19:02:25 -0000	1.1.1.1
--- ocaml.m4	22 Nov 2003 15:28:20 -0000	1.2
***************
*** 1,3 ****
! dnl autoconf macros for OCaml
  dnl by Olivier Andrieu
  dnl from a configure.in by Jean-Christophe Filliâtre,
--- 1,3 ----
! dnl -*- autoconf -*- macros for OCaml
  dnl by Olivier Andrieu
  dnl from a configure.in by Jean-Christophe Filliâtre,
***************
*** 22,28 ****
  # checking for ocamlc
  AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,AC_MSG_ERROR(Cannot find ocamlc.))
! OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
  AC_MSG_RESULT(OCaml version is $OCAMLVERSION)
! OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' ' -f 4`
  AC_MSG_RESULT(OCaml library path is $OCAMLLIB)
  # checking for ocamlopt
--- 22,28 ----
  # checking for ocamlc
  AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,AC_MSG_ERROR(Cannot find ocamlc.))
! OCAMLVERSION=$($OCAMLC -version)
  AC_MSG_RESULT(OCaml version is $OCAMLVERSION)
! OCAMLLIB=$($OCAMLC -where)
  AC_MSG_RESULT(OCaml library path is $OCAMLLIB)
  # checking for ocamlopt
***************
*** 32,36 ****
  	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.)
--- 32,36 ----
  	AC_MSG_WARN(Cannot find ocamlopt; bytecode compilation only.)
  else
! 	TMPVERSION=$($OCAMLOPT -version)
  	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
  	    AC_MSG_RESULT(versions differs from ocamlc; ocamlopt discarded.)
***************
*** 43,47 ****
  AC_CHECK_PROG(OCAMLCDOTOPT,ocamlc.opt,ocamlc.opt)
  if test "$OCAMLCDOTOPT"; 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.)
--- 43,47 ----
  AC_CHECK_PROG(OCAMLCDOTOPT,ocamlc.opt,ocamlc.opt)
  if test "$OCAMLCDOTOPT"; then
! 	TMPVERSION=$($OCAMLCDOTOPT -version)
  	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
  	    AC_MSG_RESULT(versions differs from ocamlc; ocamlc.opt discarded.)
***************
*** 54,59 ****
      AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt)
      if test "$OCAMLOPTDOTOPT"; then
! 	TMPVER=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
! 	if test "$TMPVER" != "$OCAMLVERSION" ; then
  	    AC_MSG_RESULT(version differs from ocamlc; ocamlopt.opt discarded.)
  	else
--- 54,59 ----
      AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt)
      if test "$OCAMLOPTDOTOPT"; then
! 	TMPVERSION=$($OCAMLOPTDOTOPT -version)
! 	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
  	    AC_MSG_RESULT(version differs from ocamlc; ocamlopt.opt discarded.)
  	else
***************
*** 98,102 ****
  [dnl
  # checking for ocamllex and ocamlyacc
! AC_CHECK_PROG(OCAMLLEX,ocamllex,ocamllex)
  if test "$OCAMLLEX"; then
      AC_CHECK_PROG(OCAMLLEXDOTOPT,ocamllex.opt,ocamllex.opt)
--- 98,102 ----
  [dnl
  # checking for ocamllex and ocamlyacc
! AC_CHECK_PROG(OCAMLLEX,ocamllex,ocamllex,AC_MSG_ERROR(Cannot find ocamllex.))
  if test "$OCAMLLEX"; then
      AC_CHECK_PROG(OCAMLLEXDOTOPT,ocamllex.opt,ocamllex.opt)
***************
*** 121,127 ****
  AC_CHECK_PROG(CAMLP4,camlp4,camlp4)
  if test "$CAMLP4"; then
! 	TMPVERSION=`$CAMLP4 -v 2>&1| sed -n -e 's|.*version *\(.*\)$|\1|p'`
  	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
! 	    AC_MSG_WARN(versions differs from ocamlc)
   	else
  	    AC_CHECK_PROG(CAMLP4O,camlp4o,camlp4o)
--- 121,127 ----
  AC_CHECK_PROG(CAMLP4,camlp4,camlp4)
  if test "$CAMLP4"; then
! 	TMPVERSION=$($CAMLP4 -v 2>&1| sed -n -e 's|.*version *\(.*\)$|\1|p')
  	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
! 	    AC_MSG_ERROR(versions differs from ocamlc)
   	else
  	    AC_CHECK_PROG(CAMLP4O,camlp4o,camlp4o)
***************
*** 141,145 ****
    use_findlib="$withval")
  # checking for ocamlfind
! if test "$use_findlib" ; then 
  	AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind,
  	  AC_MSG_ERROR(ocamlfind not found))
--- 141,145 ----
    use_findlib="$withval")
  # checking for ocamlfind
! if test "$use_findlib" = yes ; then 
  	AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind,
  	  AC_MSG_ERROR(ocamlfind not found))
***************
*** 157,161 ****
  [dnl
  AC_REQUIRE([AC_PROG_FINDLIB])
! if test "$use_findlib" ; then 
  	AC_MSG_CHECKING(findlib package $1)
  	if $OCAMLFIND query $1 >/dev/null 2>/dev/null; then
--- 157,161 ----
  [dnl
  AC_REQUIRE([AC_PROG_FINDLIB])
! if test "$use_findlib" = yes ; then 
  	AC_MSG_CHECKING(findlib package $1)
  	if $OCAMLFIND query $1 >/dev/null 2>/dev/null; then
***************
*** 175,182 ****
  [dnl
  AC_ARG_WITH(installdir,[  --with-installdir=DIR	  specify installation directory],INSTALLDIR="$withval")
! if test -z "$INSTALLDIR" ; then
!   if test -z "$use_findlib" ; then 
!     INSTALLDIR='$(OCAMLLIB)/site-lib/$(NAME)'
!   fi
  fi
  AC_SUBST(INSTALLDIR)
--- 175,180 ----
  [dnl
  AC_ARG_WITH(installdir,[  --with-installdir=DIR	  specify installation directory],INSTALLDIR="$withval")
! if ! test "$INSTALLDIR" -o "$use_findlib" ; then
!     INSTALLDIR='$(OCAMLLIB)/$(NAME)'
  fi
  AC_SUBST(INSTALLDIR)
***************
*** 203,207 ****
    fi
  done
! if test -n "$found" ; then
    AC_MSG_RESULT($$2)
  else
--- 201,205 ----
    fi
  done
! if test "$found" ; then
    AC_MSG_RESULT($$2)
  else