diff -Nru ocamlsdl-0.8.0/aclocal.m4 ocamlsdl-0.9.0/aclocal.m4
--- ocamlsdl-0.8.0/aclocal.m4	2010-04-19 21:03:12.000000000 +0000
+++ ocamlsdl-0.9.0/aclocal.m4	2012-05-28 17:46:43.000000000 +0000
@@ -45,10 +45,12 @@
     fi
   fi
 
+  as_save_PATH="$PATH"
   if test "x$prefix" != xNONE; then
     PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   fi
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+  PATH="$as_save_PATH"
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   no_sdl=""
diff -Nru ocamlsdl-0.8.0/configure ocamlsdl-0.9.0/configure
--- ocamlsdl-0.8.0/configure	2010-04-19 21:03:13.000000000 +0000
+++ ocamlsdl-0.9.0/configure	2012-05-28 17:46:45.000000000 +0000
@@ -1,18 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ocamlsdl 0.8.0.
+# Generated by GNU Autoconf 2.68 for ocamlsdl 0.9.0.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +24,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -44,7 +40,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +57,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +80,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -94,15 +89,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -114,12 +110,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,330 +131,306 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
 fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
-fi
 
-fi
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -471,8 +447,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -482,29 +457,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -534,7 +498,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -553,10 +517,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -570,11 +534,11 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -589,14 +553,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='ocamlsdl'
 PACKAGE_TARNAME='ocamlsdl'
-PACKAGE_VERSION='0.8.0'
-PACKAGE_STRING='ocamlsdl 0.8.0'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='ocamlsdl 0.9.0'
 PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -645,10 +609,10 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ALLOCA
 EGREP
 GREP
 CPP
-ALLOCA
 RANLIB
 OBJEXT
 EXEEXT
@@ -703,6 +667,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -794,8 +759,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -840,8 +806,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -867,8 +832,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1072,8 +1036,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1089,8 +1052,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1120,17 +1082,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1139,7 +1101,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1147,15 +1109,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1178,8 +1138,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1193,8 +1152,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1209,11 +1168,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1252,13 +1209,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1284,7 +1239,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ocamlsdl 0.8.0 to adapt to many kinds of systems.
+\`configure' configures ocamlsdl 0.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1298,7 +1253,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1345,7 +1300,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ocamlsdl 0.8.0:";;
+     short | recursive ) echo "Configuration of ocamlsdl 0.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1373,13 +1328,14 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1442,22 +1398,427 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ocamlsdl configure 0.8.0
-generated by GNU Autoconf 2.63
+ocamlsdl configure 0.9.0
+generated by GNU Autoconf 2.68
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ocamlsdl $as_me 0.8.0, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by ocamlsdl $as_me 0.9.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1493,8 +1854,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1531,9 +1892,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1549,13 +1910,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1567,11 +1928,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1580,13 +1939,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1605,11 +1964,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1622,11 +1979,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1640,11 +1995,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1658,46 +2011,53 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1708,19 +2068,23 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1728,7 +2092,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1743,11 +2107,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1757,17 +2121,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1779,43 +2143,20 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1841,9 +2182,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ./support \"$srcdir\"/./support" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in ./support \"$srcdir\"/./support" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ./support \"$srcdir\"/./support" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1863,9 +2202,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLC+set}" = set; then
+if ${ac_cv_prog_OCAMLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLC"; then
@@ -1876,24 +2215,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLC="${ac_tool_prefix}ocamlc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLC=$ac_cv_prog_OCAMLC
 if test -n "$OCAMLC"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
 $as_echo "$OCAMLC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1903,9 +2242,9 @@
   ac_ct_OCAMLC=$OCAMLC
   # Extract the first word of "ocamlc", so it can be a program name with args.
 set dummy ocamlc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLC+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLC"; then
@@ -1916,24 +2255,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLC="ocamlc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLC=$ac_cv_prog_ac_ct_OCAMLC
 if test -n "$ac_ct_OCAMLC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLC" >&5
 $as_echo "$ac_ct_OCAMLC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1942,7 +2281,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -1955,16 +2294,16 @@
 
   if test "$OCAMLC" != "no"; then
      OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p'`
-     { $as_echo "$as_me:$LINENO: result: OCaml version is $OCAMLVERSION" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml version is $OCAMLVERSION" >&5
 $as_echo "OCaml version is $OCAMLVERSION" >&6; }
      # 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
-        { $as_echo "$as_me:$LINENO: result: OCAMLLIB previously set; preserving it." >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCAMLLIB previously set; preserving it." >&5
 $as_echo "OCAMLLIB previously set; preserving it." >&6; }
      fi
-     { $as_echo "$as_me:$LINENO: result: OCaml library path is $OCAMLLIB" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml library path is $OCAMLLIB" >&5
 $as_echo "OCaml library path is $OCAMLLIB" >&6; }
 
 
@@ -1974,9 +2313,9 @@
      if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlopt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlopt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLOPT+set}" = set; then
+if ${ac_cv_prog_OCAMLOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLOPT"; then
@@ -1987,24 +2326,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLOPT=$ac_cv_prog_OCAMLOPT
 if test -n "$OCAMLOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
 $as_echo "$OCAMLOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2014,9 +2353,9 @@
   ac_ct_OCAMLOPT=$OCAMLOPT
   # Extract the first word of "ocamlopt", so it can be a program name with args.
 set dummy ocamlopt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLOPT+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLOPT"; then
@@ -2027,24 +2366,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLOPT="ocamlopt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLOPT=$ac_cv_prog_ac_ct_OCAMLOPT
 if test -n "$ac_ct_OCAMLOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPT" >&5
 $as_echo "$ac_ct_OCAMLOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2053,7 +2392,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2065,12 +2404,12 @@
 
      OCAMLBEST=byte
      if test "$OCAMLOPT" = "no"; then
-	{ $as_echo "$as_me:$LINENO: WARNING: Cannot find ocamlopt; bytecode compilation only." >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find ocamlopt; bytecode compilation only." >&5
 $as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." >&2;}
      else
 	TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
 	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
-	    { $as_echo "$as_me:$LINENO: result: versions differs from ocamlc; ocamlopt discarded." >&5
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs from ocamlc; ocamlopt discarded." >&5
 $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
 	    OCAMLOPT=no
 	else
@@ -2084,9 +2423,9 @@
      if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlc.opt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlc.opt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLCDOTOPT+set}" = set; then
+if ${ac_cv_prog_OCAMLCDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLCDOTOPT"; then
@@ -2097,24 +2436,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLCDOTOPT=$ac_cv_prog_OCAMLCDOTOPT
 if test -n "$OCAMLCDOTOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLCDOTOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLCDOTOPT" >&5
 $as_echo "$OCAMLCDOTOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2124,9 +2463,9 @@
   ac_ct_OCAMLCDOTOPT=$OCAMLCDOTOPT
   # Extract the first word of "ocamlc.opt", so it can be a program name with args.
 set dummy ocamlc.opt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLCDOTOPT+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLCDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLCDOTOPT"; then
@@ -2137,24 +2476,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLCDOTOPT="ocamlc.opt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLCDOTOPT=$ac_cv_prog_ac_ct_OCAMLCDOTOPT
 if test -n "$ac_ct_OCAMLCDOTOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLCDOTOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLCDOTOPT" >&5
 $as_echo "$ac_ct_OCAMLCDOTOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2163,7 +2502,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2176,7 +2515,7 @@
      if test "$OCAMLCDOTOPT" != "no"; then
 	TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
 	if test "$TMPVERSION" != "$OCAMLVERSION" ; then
-	    { $as_echo "$as_me:$LINENO: result: versions differs from ocamlc; ocamlc.opt discarded." >&5
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs from ocamlc; ocamlc.opt discarded." >&5
 $as_echo "versions differs from ocamlc; ocamlc.opt discarded." >&6; }
 	else
 	    OCAMLC=$OCAMLCDOTOPT
@@ -2188,9 +2527,9 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlopt.opt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlopt.opt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLOPTDOTOPT+set}" = set; then
+if ${ac_cv_prog_OCAMLOPTDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLOPTDOTOPT"; then
@@ -2201,24 +2540,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLOPTDOTOPT="${ac_tool_prefix}ocamlopt.opt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLOPTDOTOPT=$ac_cv_prog_OCAMLOPTDOTOPT
 if test -n "$OCAMLOPTDOTOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLOPTDOTOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPTDOTOPT" >&5
 $as_echo "$OCAMLOPTDOTOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2228,9 +2567,9 @@
   ac_ct_OCAMLOPTDOTOPT=$OCAMLOPTDOTOPT
   # Extract the first word of "ocamlopt.opt", so it can be a program name with args.
 set dummy ocamlopt.opt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLOPTDOTOPT+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLOPTDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
@@ -2241,24 +2580,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLOPTDOTOPT="ocamlopt.opt"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLOPTDOTOPT=$ac_cv_prog_ac_ct_OCAMLOPTDOTOPT
 if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLOPTDOTOPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPTDOTOPT" >&5
 $as_echo "$ac_ct_OCAMLOPTDOTOPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2267,7 +2606,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2280,7 +2619,7 @@
 	if test "$OCAMLOPTDOTOPT" != "no"; then
 	   TMPVERSION=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
 	   if test "$TMPVERSION" != "$OCAMLVERSION" ; then
-	      { $as_echo "$as_me:$LINENO: result: version differs from ocamlc; ocamlopt.opt discarded." >&5
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: result: version differs from ocamlc; ocamlopt.opt discarded." >&5
 $as_echo "version differs from ocamlc; ocamlopt.opt discarded." >&6; }
 	   else
 	      OCAMLOPT=$OCAMLOPTDOTOPT
@@ -2297,9 +2636,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocaml", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocaml; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAML+set}" = set; then
+if ${ac_cv_prog_OCAML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAML"; then
@@ -2310,24 +2649,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAML="${ac_tool_prefix}ocaml"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAML=$ac_cv_prog_OCAML
 if test -n "$OCAML"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAML" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAML" >&5
 $as_echo "$OCAML" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2337,9 +2676,9 @@
   ac_ct_OCAML=$OCAML
   # Extract the first word of "ocaml", so it can be a program name with args.
 set dummy ocaml; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAML+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAML"; then
@@ -2350,24 +2689,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAML="ocaml"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAML=$ac_cv_prog_ac_ct_OCAML
 if test -n "$ac_ct_OCAML"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAML" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAML" >&5
 $as_echo "$ac_ct_OCAML" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2376,7 +2715,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2391,9 +2730,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamldep", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamldep; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLDEP+set}" = set; then
+if ${ac_cv_prog_OCAMLDEP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLDEP"; then
@@ -2404,24 +2743,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLDEP="${ac_tool_prefix}ocamldep"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLDEP=$ac_cv_prog_OCAMLDEP
 if test -n "$OCAMLDEP"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLDEP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
 $as_echo "$OCAMLDEP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2431,9 +2770,9 @@
   ac_ct_OCAMLDEP=$OCAMLDEP
   # Extract the first word of "ocamldep", so it can be a program name with args.
 set dummy ocamldep; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLDEP+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLDEP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLDEP"; then
@@ -2444,24 +2783,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLDEP="ocamldep"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLDEP=$ac_cv_prog_ac_ct_OCAMLDEP
 if test -n "$ac_ct_OCAMLDEP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLDEP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDEP" >&5
 $as_echo "$ac_ct_OCAMLDEP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2470,7 +2809,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2485,9 +2824,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlmktop", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlmktop; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLMKTOP+set}" = set; then
+if ${ac_cv_prog_OCAMLMKTOP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLMKTOP"; then
@@ -2498,24 +2837,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLMKTOP="${ac_tool_prefix}ocamlmktop"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLMKTOP=$ac_cv_prog_OCAMLMKTOP
 if test -n "$OCAMLMKTOP"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLMKTOP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKTOP" >&5
 $as_echo "$OCAMLMKTOP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2525,9 +2864,9 @@
   ac_ct_OCAMLMKTOP=$OCAMLMKTOP
   # Extract the first word of "ocamlmktop", so it can be a program name with args.
 set dummy ocamlmktop; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLMKTOP+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLMKTOP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLMKTOP"; then
@@ -2538,24 +2877,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLMKTOP="ocamlmktop"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLMKTOP=$ac_cv_prog_ac_ct_OCAMLMKTOP
 if test -n "$ac_ct_OCAMLMKTOP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLMKTOP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKTOP" >&5
 $as_echo "$ac_ct_OCAMLMKTOP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2564,7 +2903,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2579,9 +2918,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlmklib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlmklib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLMKLIB+set}" = set; then
+if ${ac_cv_prog_OCAMLMKLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLMKLIB"; then
@@ -2592,24 +2931,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLMKLIB="${ac_tool_prefix}ocamlmklib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLMKLIB=$ac_cv_prog_OCAMLMKLIB
 if test -n "$OCAMLMKLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLMKLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKLIB" >&5
 $as_echo "$OCAMLMKLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2619,9 +2958,9 @@
   ac_ct_OCAMLMKLIB=$OCAMLMKLIB
   # Extract the first word of "ocamlmklib", so it can be a program name with args.
 set dummy ocamlmklib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLMKLIB+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLMKLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLMKLIB"; then
@@ -2632,24 +2971,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLMKLIB="ocamlmklib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLMKLIB=$ac_cv_prog_ac_ct_OCAMLMKLIB
 if test -n "$ac_ct_OCAMLMKLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLMKLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKLIB" >&5
 $as_echo "$ac_ct_OCAMLMKLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2658,7 +2997,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2673,9 +3012,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamldoc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamldoc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLDOC+set}" = set; then
+if ${ac_cv_prog_OCAMLDOC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLDOC"; then
@@ -2686,24 +3025,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLDOC="${ac_tool_prefix}ocamldoc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLDOC=$ac_cv_prog_OCAMLDOC
 if test -n "$OCAMLDOC"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLDOC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDOC" >&5
 $as_echo "$OCAMLDOC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2713,9 +3052,9 @@
   ac_ct_OCAMLDOC=$OCAMLDOC
   # Extract the first word of "ocamldoc", so it can be a program name with args.
 set dummy ocamldoc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLDOC+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLDOC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLDOC"; then
@@ -2726,24 +3065,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLDOC="ocamldoc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLDOC=$ac_cv_prog_ac_ct_OCAMLDOC
 if test -n "$ac_ct_OCAMLDOC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLDOC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDOC" >&5
 $as_echo "$ac_ct_OCAMLDOC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2752,7 +3091,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2767,9 +3106,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlbuild", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlbuild; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLBUILD+set}" = set; then
+if ${ac_cv_prog_OCAMLBUILD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLBUILD"; then
@@ -2780,24 +3119,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLBUILD="${ac_tool_prefix}ocamlbuild"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLBUILD=$ac_cv_prog_OCAMLBUILD
 if test -n "$OCAMLBUILD"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLBUILD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLBUILD" >&5
 $as_echo "$OCAMLBUILD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2807,9 +3146,9 @@
   ac_ct_OCAMLBUILD=$OCAMLBUILD
   # Extract the first word of "ocamlbuild", so it can be a program name with args.
 set dummy ocamlbuild; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLBUILD+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLBUILD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLBUILD"; then
@@ -2820,24 +3159,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLBUILD="ocamlbuild"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLBUILD=$ac_cv_prog_ac_ct_OCAMLBUILD
 if test -n "$ac_ct_OCAMLBUILD"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLBUILD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLBUILD" >&5
 $as_echo "$ac_ct_OCAMLBUILD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2846,7 +3185,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2862,9 +3201,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ocamlfind", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ocamlfind; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OCAMLFIND+set}" = set; then
+if ${ac_cv_prog_OCAMLFIND+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLFIND"; then
@@ -2875,24 +3214,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OCAMLFIND="${ac_tool_prefix}ocamlfind"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OCAMLFIND=$ac_cv_prog_OCAMLFIND
 if test -n "$OCAMLFIND"; then
-  { $as_echo "$as_me:$LINENO: result: $OCAMLFIND" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLFIND" >&5
 $as_echo "$OCAMLFIND" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2902,9 +3241,9 @@
   ac_ct_OCAMLFIND=$OCAMLFIND
   # Extract the first word of "ocamlfind", so it can be a program name with args.
 set dummy ocamlfind; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OCAMLFIND+set}" = set; then
+if ${ac_cv_prog_ac_ct_OCAMLFIND+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLFIND"; then
@@ -2915,24 +3254,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OCAMLFIND="ocamlfind"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OCAMLFIND=$ac_cv_prog_ac_ct_OCAMLFIND
 if test -n "$ac_ct_OCAMLFIND"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OCAMLFIND" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLFIND" >&5
 $as_echo "$ac_ct_OCAMLFIND" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2941,7 +3280,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2954,9 +3293,7 @@
 
 
 if test "$OCAML" = no ; then
-   { { $as_echo "$as_me:$LINENO: error: Cannot find ocaml" >&5
-$as_echo "$as_me: error: Cannot find ocaml" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "Cannot find ocaml" "$LINENO" 5
 fi
 if test "$OCAMLFIND" = no ; then
    unset OCAMLFIND
@@ -2964,7 +3301,7 @@
 
 
 # OCaml platform
-    { $as_echo "$as_me:$LINENO: checking OCaml Sys.os_type" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCaml Sys.os_type" >&5
 $as_echo_n "checking OCaml Sys.os_type... " >&6; }
 
   cat > conftest.ml <<EOF
@@ -2972,7 +3309,7 @@
 EOF
 
   OCAML_OS_TYPE=`$OCAML conftest.ml`
-  { $as_echo "$as_me:$LINENO: result: $OCAML_OS_TYPE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAML_OS_TYPE" >&5
 $as_echo "$OCAML_OS_TYPE" >&6; }
 
 
@@ -2991,9 +3328,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3004,24 +3341,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3031,9 +3368,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3044,24 +3381,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3070,7 +3407,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3084,9 +3421,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3097,24 +3434,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3124,9 +3461,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3138,18 +3475,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -3168,10 +3505,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3183,9 +3520,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3196,24 +3533,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3227,9 +3564,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3240,24 +3577,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3270,7 +3607,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3281,57 +3618,37 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3347,8 +3664,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3364,17 +3681,17 @@
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3391,7 +3708,7 @@
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3410,84 +3727,41 @@
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3502,32 +3776,83 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3539,17 +3864,17 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3562,31 +3887,23 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3600,37 +3917,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3639,20 +3935,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3663,35 +3955,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3702,36 +3970,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3742,42 +3986,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -3794,18 +4013,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3862,32 +4077,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3898,17 +4090,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3920,9 +4114,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -3933,24 +4127,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3960,9 +4154,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -3973,24 +4167,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3999,7 +4193,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4015,14 +4209,14 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4037,11 +4231,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -4050,78 +4240,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -4133,7 +4279,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -4144,11 +4290,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -4157,87 +4299,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4247,9 +4342,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4260,7 +4355,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -4280,7 +4375,7 @@
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4295,26 +4390,24 @@
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4328,7 +4421,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -4348,7 +4441,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4363,12 +4456,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4376,21 +4467,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4405,48 +4492,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4456,18 +4518,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4477,14 +4535,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4511,118 +4565,33 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4632,18 +4601,25 @@
 done
 
 
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
+if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -4655,59 +4631,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
 $as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
+if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4723,7 +4668,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -4739,47 +4684,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
 $as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -4789,21 +4707,15 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
+if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -4813,7 +4725,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
@@ -4821,101 +4733,13 @@
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -4927,19 +4751,15 @@
   done
 fi
 
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
+if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -4962,46 +4782,18 @@
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
 $as_echo "$ac_cv_c_stack_direction" >&6; }
-
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -5009,18 +4801,14 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -5029,41 +4817,17 @@
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 $as_echo "$ac_cv_c_inline" >&6; }
 
-
 case $ac_cv_c_inline in
   inline | yes) ;;
   *)
@@ -5080,9 +4844,7 @@
 esac
 
 if test "$ac_cv_c_inline" != no ; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_INLINE 1
-_ACEOF
+  $as_echo "#define HAVE_INLINE 1" >>confdefs.h
 
 fi
 
@@ -5100,10 +4862,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5111,11 +4873,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -5152,7 +4914,7 @@
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -5168,7 +4930,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -5183,11 +4945,11 @@
 # Checking for lablGL
 
 # Check whether --with-lablgldir was given.
-if test "${with_lablgldir+set}" = set; then
+if test "${with_lablgldir+set}" = set; then :
   withval=$with_lablgldir; LABLGLDIR="$withval"
 fi
 
-  { $as_echo "$as_me:$LINENO: checking for OCaml module lablGL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml module lablGL" >&5
 $as_echo_n "checking for OCaml module lablGL... " >&6; }
 
   cat > conftest.ml <<EOF
@@ -5202,10 +4964,10 @@
   done
 
   if test "$found" ; then
-    { $as_echo "$as_me:$LINENO: result: $LABLGLDIR" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LABLGLDIR" >&5
 $as_echo "$LABLGLDIR" >&6; }
   else
-    { $as_echo "$as_me:$LINENO: result: not found" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
     LABLGLDIR=no
   fi
@@ -5216,7 +4978,7 @@
 # Where to install the library ?
 
 # Check whether --with-installdir was given.
-if test "${with_installdir+set}" = set; then
+if test "${with_installdir+set}" = set; then :
   withval=$with_installdir; OCAMLSDLDIR="$withval"
 else
   OCAMLSDLDIR="$OCAMLLIB/sdl"
@@ -5230,7 +4992,7 @@
 SDL_VERSION=1.2.0
 
 # Check whether --with-sdl-prefix was given.
-if test "${with_sdl_prefix+set}" = set; then
+if test "${with_sdl_prefix+set}" = set; then :
   withval=$with_sdl_prefix; sdl_prefix="$withval"
 else
   sdl_prefix=""
@@ -5238,14 +5000,14 @@
 
 
 # Check whether --with-sdl-exec-prefix was given.
-if test "${with_sdl_exec_prefix+set}" = set; then
+if test "${with_sdl_exec_prefix+set}" = set; then :
   withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
 else
   sdl_exec_prefix=""
 fi
 
 # Check whether --enable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then
+if test "${enable_sdltest+set}" = set; then :
   enableval=$enable_sdltest;
 else
   enable_sdltest=yes
@@ -5265,14 +5027,15 @@
     fi
   fi
 
+  as_save_PATH="$PATH"
   if test "x$prefix" != xNONE; then
     PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   fi
   # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
+if ${ac_cv_path_SDL_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $SDL_CONFIG in
@@ -5285,14 +5048,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
@@ -5301,16 +5064,17 @@
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 if test -n "$SDL_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
 $as_echo "$SDL_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+  PATH="$as_save_PATH"
   min_sdl_version=$SDL_VERSION
-  { $as_echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
 $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
@@ -5333,14 +5097,10 @@
       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
       LIBS="$LIBS $SDL_LIBS"
       rm -f conf.sdltest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -5401,53 +5161,26 @@
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-no_sdl=yes
+else
+  no_sdl=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
        CFLAGS="$ac_save_CFLAGS"
        CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_sdl" = x ; then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
      :
   else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      if test "$SDL_CONFIG" = "no" ; then
        echo "*** The sdl-config script installed by SDL could not be found"
@@ -5462,11 +5195,7 @@
           CFLAGS="$CFLAGS $SDL_CFLAGS"
           CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
           LIBS="$LIBS $SDL_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -5485,27 +5214,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
           echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
@@ -5516,18 +5225,13 @@
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"
@@ -5535,9 +5239,7 @@
      fi
      SDL_CFLAGS=""
      SDL_LIBS=""
-     { { $as_echo "$as_me:$LINENO: error: *** SDL version $SDL_VERSION not found!" >&5
-$as_echo "$as_me: error: *** SDL version $SDL_VERSION not found!" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
 
   fi
 
@@ -5554,28 +5256,28 @@
 
 # cmdline options
 # Check whether --enable-sdl_ttf was given.
-if test "${enable_sdl_ttf+set}" = set; then
+if test "${enable_sdl_ttf+set}" = set; then :
   enableval=$enable_sdl_ttf; sdl_ttf=$enableval
 else
   sdl_ttf=yes
 fi
 
 # Check whether --enable-sdl_image was given.
-if test "${enable_sdl_image+set}" = set; then
+if test "${enable_sdl_image+set}" = set; then :
   enableval=$enable_sdl_image; sdl_image=$enableval
 else
   sdl_image=yes
 fi
 
 # Check whether --enable-sdl_mixer was given.
-if test "${enable_sdl_mixer+set}" = set; then
+if test "${enable_sdl_mixer+set}" = set; then :
   enableval=$enable_sdl_mixer; sdl_mixer=$enableval
 else
   sdl_mixer=yes
 fi
 
 # Check whether --enable-sdl_gfx was given.
-if test "${enable_sdl_gfx+set}" = set; then
+if test "${enable_sdl_gfx+set}" = set; then :
   enableval=$enable_sdl_gfx; sdl_gfx=$enableval
 else
   sdl_gfx=yes
@@ -5585,146 +5287,12 @@
 
 # Checking for lib SDL_ttf
 if test "$sdl_ttf" = yes ; then
-
-for ac_header in SDL_ttf.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in SDL_ttf.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL_ttf.h" "ac_cv_header_SDL_ttf_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_ttf_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SDL_TTF_H 1
 _ACEOF
  :
 else
@@ -5734,18 +5302,14 @@
 done
 
   if test "$sdl_ttf" = yes ; then
-    { $as_echo "$as_me:$LINENO: checking for TTF_OpenFontRW in -lSDL_ttf" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_OpenFontRW in -lSDL_ttf" >&5
 $as_echo_n "checking for TTF_OpenFontRW in -lSDL_ttf... " >&6; }
-if test "${ac_cv_lib_SDL_ttf_TTF_OpenFontRW+set}" = set; then
+if ${ac_cv_lib_SDL_ttf_TTF_OpenFontRW+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_ttf  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5763,61 +5327,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_ttf_TTF_OpenFontRW=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_ttf_TTF_OpenFontRW=no
+  ac_cv_lib_SDL_ttf_TTF_OpenFontRW=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_ttf_TTF_OpenFontRW" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_ttf_TTF_OpenFontRW" >&5
 $as_echo "$ac_cv_lib_SDL_ttf_TTF_OpenFontRW" >&6; }
-if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFontRW" = x""yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define OCAMLSDL_TTF_VERSION 206
-_ACEOF
+if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFontRW" = xyes; then :
+  $as_echo "#define OCAMLSDL_TTF_VERSION 206" >>confdefs.h
 
 else
 
-      { $as_echo "$as_me:$LINENO: checking for TTF_OpenFontIndex in -lSDL_ttf" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_OpenFontIndex in -lSDL_ttf" >&5
 $as_echo_n "checking for TTF_OpenFontIndex in -lSDL_ttf... " >&6; }
-if test "${ac_cv_lib_SDL_ttf_TTF_OpenFontIndex+set}" = set; then
+if ${ac_cv_lib_SDL_ttf_TTF_OpenFontIndex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_ttf  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5835,61 +5368,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_ttf_TTF_OpenFontIndex=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_ttf_TTF_OpenFontIndex=no
+  ac_cv_lib_SDL_ttf_TTF_OpenFontIndex=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_ttf_TTF_OpenFontIndex" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_ttf_TTF_OpenFontIndex" >&5
 $as_echo "$ac_cv_lib_SDL_ttf_TTF_OpenFontIndex" >&6; }
-if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFontIndex" = x""yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define OCAMLSDL_TTF_VERSION 204
-_ACEOF
+if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFontIndex" = xyes; then :
+  $as_echo "#define OCAMLSDL_TTF_VERSION 204" >>confdefs.h
 
 else
 
-        { $as_echo "$as_me:$LINENO: checking for TTF_OpenFont in -lSDL_ttf" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_OpenFont in -lSDL_ttf" >&5
 $as_echo_n "checking for TTF_OpenFont in -lSDL_ttf... " >&6; }
-if test "${ac_cv_lib_SDL_ttf_TTF_OpenFont+set}" = set; then
+if ${ac_cv_lib_SDL_ttf_TTF_OpenFont+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_ttf  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5907,51 +5409,22 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_ttf_TTF_OpenFont=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_ttf_TTF_OpenFont=no
+  ac_cv_lib_SDL_ttf_TTF_OpenFont=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_ttf_TTF_OpenFont" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_ttf_TTF_OpenFont" >&5
 $as_echo "$ac_cv_lib_SDL_ttf_TTF_OpenFont" >&6; }
-if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFont" = x""yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define OCAMLSDL_TTF_VERSION 200
-_ACEOF
+if test "x$ac_cv_lib_SDL_ttf_TTF_OpenFont" = xyes; then :
+  $as_echo "#define OCAMLSDL_TTF_VERSION 200" >>confdefs.h
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Cannot find SDL_tff library." >&5
-$as_echo "$as_me: error: Cannot find SDL_tff library." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "Cannot find SDL_tff library." "$LINENO" 5
 fi
 
 
@@ -5966,146 +5439,12 @@
 
 # Checking for lib SDL_image
 if test "$sdl_image" = yes ; then
-
-for ac_header in SDL_image.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in SDL_image.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_image_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SDL_IMAGE_H 1
 _ACEOF
  :
 else
@@ -6115,18 +5454,14 @@
 done
 
   if test "$sdl_image" = yes ; then
-    { $as_echo "$as_me:$LINENO: checking for IMG_ReadXPMFromArray in -lSDL_image" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_ReadXPMFromArray in -lSDL_image" >&5
 $as_echo_n "checking for IMG_ReadXPMFromArray in -lSDL_image... " >&6; }
-if test "${ac_cv_lib_SDL_image_IMG_ReadXPMFromArray+set}" = set; then
+if ${ac_cv_lib_SDL_image_IMG_ReadXPMFromArray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_image  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -6144,61 +5479,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_image_IMG_ReadXPMFromArray=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_image_IMG_ReadXPMFromArray=no
+  ac_cv_lib_SDL_image_IMG_ReadXPMFromArray=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_ReadXPMFromArray" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_ReadXPMFromArray" >&5
 $as_echo "$ac_cv_lib_SDL_image_IMG_ReadXPMFromArray" >&6; }
-if test "x$ac_cv_lib_SDL_image_IMG_ReadXPMFromArray" = x""yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define OCAMLSDL_IMAGE_VERSION 121
-_ACEOF
+if test "x$ac_cv_lib_SDL_image_IMG_ReadXPMFromArray" = xyes; then :
+  $as_echo "#define OCAMLSDL_IMAGE_VERSION 121" >>confdefs.h
 
 else
 
-      { $as_echo "$as_me:$LINENO: checking for IMG_Load_RW in -lSDL_image" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load_RW in -lSDL_image" >&5
 $as_echo_n "checking for IMG_Load_RW in -lSDL_image... " >&6; }
-if test "${ac_cv_lib_SDL_image_IMG_Load_RW+set}" = set; then
+if ${ac_cv_lib_SDL_image_IMG_Load_RW+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_image  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -6216,51 +5520,22 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_image_IMG_Load_RW=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_image_IMG_Load_RW=no
+  ac_cv_lib_SDL_image_IMG_Load_RW=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load_RW" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load_RW" >&5
 $as_echo "$ac_cv_lib_SDL_image_IMG_Load_RW" >&6; }
-if test "x$ac_cv_lib_SDL_image_IMG_Load_RW" = x""yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define OCAMLSDL_IMAGE_VERSION 120
-_ACEOF
+if test "x$ac_cv_lib_SDL_image_IMG_Load_RW" = xyes; then :
+  $as_echo "#define OCAMLSDL_IMAGE_VERSION 120" >>confdefs.h
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Cannot find SDL_image library." >&5
-$as_echo "$as_me: error: Cannot find SDL_image library." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "Cannot find SDL_image library." "$LINENO" 5
 fi
 
 
@@ -6270,376 +5545,77 @@
   fi
 fi
 
-# Checking for lib SDL_mixer
-if test "$sdl_mixer" = yes ; then
-
-for ac_header in SDL_mixer.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- :
-else
-  sdl_mixer=no
-fi
-
-done
-
-  if test "$sdl_mixer" = yes ; then
-    { $as_echo "$as_me:$LINENO: checking for Mix_QuickLoad_WAV in -lSDL_mixer" >&5
-$as_echo_n "checking for Mix_QuickLoad_WAV in -lSDL_mixer... " >&6; }
-if test "${ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_mixer  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char Mix_QuickLoad_WAV ();
-int
-main ()
-{
-return Mix_QuickLoad_WAV ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" >&5
-$as_echo "$ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" >&6; }
-if test "x$ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" = x""yes; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: Cannot find SDL_mixer library." >&5
-$as_echo "$as_me: error: Cannot find SDL_mixer library." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-    PARTS="$PARTS mixer"
-  fi
-fi
-
-# Checking for lib SDL_gfx
-if test "$sdl_gfx" = yes ; then
-
-for ac_header in SDL_gfxPrimitives.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+# Checking for lib SDL_mixer
+if test "$sdl_mixer" = yes ; then
+  for ac_header in SDL_mixer.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL_mixer.h" "ac_cv_header_SDL_mixer_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_mixer_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_MIXER_H 1
+_ACEOF
+ :
+else
+  sdl_mixer=no
+fi
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+done
 
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  if test "$sdl_mixer" = yes ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mix_QuickLoad_WAV in -lSDL_mixer" >&5
+$as_echo_n "checking for Mix_QuickLoad_WAV in -lSDL_mixer... " >&6; }
+if ${ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSDL_mixer  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Mix_QuickLoad_WAV ();
+int
+main ()
+{
+return Mix_QuickLoad_WAV ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV=yes
+else
+  ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" >&5
+$as_echo "$ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" >&6; }
+if test "x$ac_cv_lib_SDL_mixer_Mix_QuickLoad_WAV" = xyes; then :
+  :
+else
+  as_fn_error $? "Cannot find SDL_mixer library." "$LINENO" 5
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
+    PARTS="$PARTS mixer"
+  fi
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+
+# Checking for lib SDL_gfx
+if test "$sdl_gfx" = yes ; then
+  for ac_header in SDL_gfxPrimitives.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL_gfxPrimitives.h" "ac_cv_header_SDL_gfxPrimitives_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_gfxPrimitives_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SDL_GFXPRIMITIVES_H 1
 _ACEOF
  :
 else
@@ -6649,18 +5625,14 @@
 done
 
   if test "$sdl_gfx" = yes ; then
-    { $as_echo "$as_me:$LINENO: checking for pixelColor in -lSDL_gfx" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixelColor in -lSDL_gfx" >&5
 $as_echo_n "checking for pixelColor in -lSDL_gfx... " >&6; }
-if test "${ac_cv_lib_SDL_gfx_pixelColor+set}" = set; then
+if ${ac_cv_lib_SDL_gfx_pixelColor+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_gfx  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -6678,48 +5650,21 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_SDL_gfx_pixelColor=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_SDL_gfx_pixelColor=no
+  ac_cv_lib_SDL_gfx_pixelColor=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_gfx_pixelColor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_gfx_pixelColor" >&5
 $as_echo "$ac_cv_lib_SDL_gfx_pixelColor" >&6; }
-if test "x$ac_cv_lib_SDL_gfx_pixelColor" = x""yes; then
+if test "x$ac_cv_lib_SDL_gfx_pixelColor" = xyes; then :
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: Cannot find SDL_gfx library." >&5
-$as_echo "$as_me: error: Cannot find SDL_gfx library." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "Cannot find SDL_gfx library." "$LINENO" 5
 fi
 
     PARTS="$PARTS gfx"
@@ -6756,13 +5701,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -6770,8 +5715,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -6793,12 +5738,23 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -6812,14 +5768,15 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -6827,13 +5784,14 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -6843,17 +5801,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -6861,23 +5820,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -6885,7 +5836,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -6896,7 +5853,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -6919,13 +5876,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -6935,15 +5885,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -6955,12 +5906,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -6972,7 +5927,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -6986,8 +6023,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -7007,76 +6048,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -7105,8 +6095,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -7125,10 +6163,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -7143,13 +6181,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ocamlsdl $as_me 0.8.0, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by ocamlsdl $as_me 0.9.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -7180,13 +6224,15 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -7202,16 +6248,17 @@
 Configuration headers:
 $config_headers
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ocamlsdl config.status 0.8.0
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ocamlsdl config.status 0.9.0
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -7227,11 +6274,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -7245,27 +6297,29 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -7273,11 +6327,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -7328,9 +6381,7 @@
     "makefile.platform") CONFIG_FILES="$CONFIG_FILES makefile.platform" ;;
     "makefile.config.gcc") CONFIG_FILES="$CONFIG_FILES makefile.config.gcc" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -7352,26 +6403,24 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -7379,7 +6428,13 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -7387,7 +6442,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -7396,24 +6451,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -7421,7 +6470,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -7435,7 +6484,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -7449,7 +6498,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -7469,7 +6518,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -7501,23 +6550,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -7529,7 +6584,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -7541,13 +6596,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -7632,9 +6685,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -7647,9 +6698,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -7668,7 +6717,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -7677,12 +6726,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -7693,7 +6740,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -7705,10 +6752,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -7736,47 +6781,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -7828,7 +6833,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -7838,12 +6842,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -7853,7 +6856,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -7880,27 +6883,24 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -7909,27 +6909,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -7939,15 +6933,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -7968,10 +6959,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff -Nru ocamlsdl-0.8.0/configure.in ocamlsdl-0.9.0/configure.in
--- ocamlsdl-0.8.0/configure.in	2010-04-19 21:01:14.000000000 +0000
+++ ocamlsdl-0.9.0/configure.in	2012-05-28 17:46:33.000000000 +0000
@@ -4,7 +4,7 @@
 dnl
 dnl $Id: configure.in,v 1.42 2010/04/19 21:01:14 oliv__a Exp $
 
-AC_INIT(ocamlsdl, 0.8.0)
+AC_INIT(ocamlsdl, 0.9.0)
 AC_CONFIG_AUX_DIR(./support)
 AC_CONFIG_HEADERS(src/config.h)
 
diff -Nru ocamlsdl-0.8.0/debian/changelog ocamlsdl-0.9.0/debian/changelog
--- ocamlsdl-0.8.0/debian/changelog	2012-03-05 20:25:32.000000000 +0000
+++ ocamlsdl-0.9.0/debian/changelog	2012-06-18 10:06:01.000000000 +0000
@@ -1,3 +1,11 @@
+ocamlsdl (0.9.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #667447)
+  * Switch debian/copyright to format 1.0
+  * Bump Standards-Version to 3.9.3
+
+ -- Stéphane Glondu <glondu@debian.org>  Mon, 18 Jun 2012 12:06:00 +0200
+
 ocamlsdl (0.8.0-4) unstable; urgency=low
 
   * Build-Depend on libpng-dev instead of libpng12-dev (Closes: #662449)
diff -Nru ocamlsdl-0.8.0/debian/control ocamlsdl-0.9.0/debian/control
--- ocamlsdl-0.8.0/debian/control	2012-03-05 20:24:52.000000000 +0000
+++ ocamlsdl-0.9.0/debian/control	2012-06-18 10:03:11.000000000 +0000
@@ -18,7 +18,7 @@
  libsdl-gfx1.2-dev,
  liblablgl-ocaml-dev (>= 1.04),
  ocaml-findlib (>= 1.2.4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://ocamlsdl.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlsdl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlsdl.git
diff -Nru ocamlsdl-0.8.0/debian/copyright ocamlsdl-0.9.0/debian/copyright
--- ocamlsdl-0.8.0/debian/copyright	2011-08-16 18:07:30.000000000 +0000
+++ ocamlsdl-0.9.0/debian/copyright	2012-06-18 10:03:11.000000000 +0000
@@ -1,32 +1,19 @@
-This package was debianized by Jérôme Marant <jerome@debian.org> on
-Sat, 20 Apr 2002 22:42:47 +0200.
-
-It was downloaded from http://prdownloads.sourceforge.net/ocamlsdl
-
-Upstream Authors: Frederic Brunel <brunel@mail.dotcom.fr>
-                  Luc Mazardo <luc@mazardo.com>
-                  Sami Makëlä <sajuma@utu.fi>
-                  Olivier Andrieu <oliv__a@users.sourceforge.net>
-
-Copyright (C) 2002-2008: see upstream authors
-
-License:
-
-    This package is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-OCamlSDL is distributed under the terms of the LGPL (Lesser GNU Public License).
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in /usr/share/common-licenses/LGPL-2.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Packaged-By: Jérôme Marant <jerome@debian.org>
+Packaged-Date: Sat, 20 Apr 2002 22:42:47 +0200
+
+Files: *
+Copyright: 2002-2012 Olivier Andrieu and others
+License: LGPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.
diff -Nru ocamlsdl-0.8.0/debian/patches/0001-Fix-build-on-bytecode-architectures.patch ocamlsdl-0.9.0/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
--- ocamlsdl-0.8.0/debian/patches/0001-Fix-build-on-bytecode-architectures.patch	2010-06-21 21:05:42.000000000 +0000
+++ ocamlsdl-0.9.0/debian/patches/0001-Fix-build-on-bytecode-architectures.patch	2012-06-18 09:55:03.000000000 +0000
@@ -1,12 +1,12 @@
 From: Stephane Glondu <steph@glondu.net>
 Date: Mon, 21 Jun 2010 13:54:48 -0700
-Subject: [PATCH] Fix build on bytecode architectures
+Subject: Fix build on bytecode architectures
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586619
 Signed-off-by: Stephane Glondu <steph@glondu.net>
 ---
  src/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
 index 3f53e3d..e1f77e1 100644
diff -Nru ocamlsdl-0.8.0/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch ocamlsdl-0.9.0/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch
--- ocamlsdl-0.8.0/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocamlsdl-0.9.0/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch	2012-06-18 10:03:11.000000000 +0000
@@ -0,0 +1,24 @@
+From: Florent Monnier <monnier.florent@gmail.com>
+Date: Thu, 7 Jun 2012 23:06:56 +0200
+Subject: Fix typo in sdlevent_stub
+
+Forwarded: http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlevent_stub.c?r1=1.24&r2=1.25
+
+---
+ src/sdlevent_stub.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sdlevent_stub.c b/src/sdlevent_stub.c
+index 2079ddc..71f98cc 100644
+--- a/src/sdlevent_stub.c
++++ b/src/sdlevent_stub.c
+@@ -177,7 +177,7 @@ static value value_of_SDLEvent(SDL_Event evt)
+     r = alloc_small(4, 0);
+     Field(r, 0) = Val_int(evt.jball.which);
+     Field(r, 1) = Val_int(evt.jball.ball);
+-    Field(r, 3) = Val_int(evt.jball.xrel);
++    Field(r, 2) = Val_int(evt.jball.xrel);
+     Field(r, 3) = Val_int(evt.jball.yrel);
+     v = alloc_small(1, 7);
+     Field(v, 0) = r;
+-- 
diff -Nru ocamlsdl-0.8.0/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch ocamlsdl-0.9.0/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch
--- ocamlsdl-0.8.0/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocamlsdl-0.9.0/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch	2012-06-18 10:03:11.000000000 +0000
@@ -0,0 +1,65 @@
+From: Florent Monnier <monnier.florent@gmail.com>
+Date: Thu, 14 Jun 2012 16:34:54 +0000
+Subject: Fix a couple typos/small bugs in Sdlmixer
+
+Forwarded: http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlmixer.ml?r1=1.13&r2=1.14
+Forwarded: http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlmixer.mli?r1=1.15&r2=1.16
+
+---
+ src/sdlmixer.ml  |    6 +++---
+ src/sdlmixer.mli |    7 ++++---
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/sdlmixer.ml b/src/sdlmixer.ml
+index 2427444..b573c9c 100644
+--- a/src/sdlmixer.ml
++++ b/src/sdlmixer.ml
+@@ -94,7 +94,7 @@ external allocate_channels : int -> int = "sdlmixer_allocate_channels"
+ let num_channels () = allocate_channels ~-1
+ external reserve_channels : int -> int = "sdlmixer_reserve_channels"
+ external group_channel : channel -> group -> unit = "sdlmixer_group_channel"
+-external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channel"
++external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channels"
+ external group_available : group -> channel = "sdlmixer_group_available"
+ external group_count : group -> int = "sdlmixer_group_count"
+ external group_oldest : group -> channel = "sdlmixer_group_oldest"
+@@ -113,11 +113,11 @@ let play_sound chunk = ignore (play_channel chunk)
+ 
+ external volume_channel : channel -> float = "sdlmixer_volume_channel"
+ external volume_chunk   : chunk -> float = "sdlmixer_volume_chunk"
+-external volume_music   : music -> float = "sdlmixer_volume_music"
++external volume_music   : unit -> float = "sdlmixer_volume_music"
+ 
+ external setvolume_channel : channel -> float -> unit = "sdlmixer_setvolume_channel"
+ external setvolume_chunk : chunk -> float -> unit = "sdlmixer_setvolume_chunk"
+-external setvolume_music : music -> float -> unit = "sdlmixer_setvolume_music"
++external setvolume_music : float -> unit = "sdlmixer_setvolume_music"
+ 
+ (* Stopping playing *)
+ 
+diff --git a/src/sdlmixer.mli b/src/sdlmixer.mli
+index e235971..4a20d8e 100644
+--- a/src/sdlmixer.mli
++++ b/src/sdlmixer.mli
+@@ -191,7 +191,7 @@ external group_channel : channel -> group -> unit = "sdlmixer_group_channel"
+    If group is [default_group], the tag is removed.
+ *)
+ 
+-external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channel"
++external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channels"
+ (** Same as above but for a range of channels. *)
+ 
+ external group_count : group -> int = "sdlmixer_group_count"
+@@ -252,8 +252,9 @@ external fadein_music : ?loops:int -> music -> float -> unit
+    fade in music over [ms] seconds, same semantics as the [play_music]
+    function *)
+ 
+-external volume_music   : music -> float = "sdlmixer_volume_music"
+-external setvolume_music : music -> float -> unit = "sdlmixer_setvolume_music"
++external volume_music   : unit -> float = "sdlmixer_volume_music"
++
++external setvolume_music : float -> unit = "sdlmixer_setvolume_music"
+ 
+ external pause_music   : unit -> unit = "sdlmixer_pause_music"
+ 
+-- 
diff -Nru ocamlsdl-0.8.0/debian/patches/series ocamlsdl-0.9.0/debian/patches/series
--- ocamlsdl-0.8.0/debian/patches/series	2010-06-21 21:05:42.000000000 +0000
+++ ocamlsdl-0.9.0/debian/patches/series	2012-06-18 09:58:46.000000000 +0000
@@ -1 +1,3 @@
 0001-Fix-build-on-bytecode-architectures.patch
+0002-Fix-typo-in-sdlevent_stub.patch
+0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch
diff -Nru ocamlsdl-0.8.0/debian/watch ocamlsdl-0.9.0/debian/watch
--- ocamlsdl-0.8.0/debian/watch	2009-09-08 15:34:18.000000000 +0000
+++ ocamlsdl-0.9.0/debian/watch	2012-06-18 09:55:03.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 
-http://sf.net/ocamlsdl/ocamlsdl-(.*)\.tar\.gz debian uupdate
+http://sf.net/ocamlsdl/ocamlsdl-(.*)\.tar\.gz
diff -Nru ocamlsdl-0.8.0/doc/html/index_attributes.html ocamlsdl-0.9.0/doc/html/index_attributes.html
--- ocamlsdl-0.8.0/doc/html/index_attributes.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_attributes.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of class attributes</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of class attributes</title>
 </head>
 <body>
 <center><h1>Index of class attributes</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_classes.html ocamlsdl-0.9.0/doc/html/index_classes.html
--- ocamlsdl-0.8.0/doc/html/index_classes.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_classes.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of classes</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of classes</title>
 </head>
 <body>
 <center><h1>Index of classes</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_class_types.html ocamlsdl-0.9.0/doc/html/index_class_types.html
--- ocamlsdl-0.8.0/doc/html/index_class_types.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_class_types.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of class types</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of class types</title>
 </head>
 <body>
 <center><h1>Index of class types</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_exceptions.html ocamlsdl-0.9.0/doc/html/index_exceptions.html
--- ocamlsdl-0.8.0/doc/html/index_exceptions.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_exceptions.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of exceptions</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of exceptions</title>
 </head>
 <body>
 <center><h1>Index of exceptions</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index.html ocamlsdl-0.9.0/doc/html/index.html
--- ocamlsdl-0.8.0/doc/html/index.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index.html	2012-05-28 17:53:37.000000000 +0000
@@ -20,10 +20,10 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL </title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0</title>
 </head>
 <body>
-<center><h1>OCamlSDL </h1></center>
+<center><h1>OCamlSDL 0.9.0</h1></center>
 <a href="index_types.html">Index of types</a><br>
 <a href="index_exceptions.html">Index of exceptions</a><br>
 <a href="index_values.html">Index of values</a><br>
diff -Nru ocamlsdl-0.8.0/doc/html/index_methods.html ocamlsdl-0.9.0/doc/html/index_methods.html
--- ocamlsdl-0.8.0/doc/html/index_methods.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_methods.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of class methods</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of class methods</title>
 </head>
 <body>
 <center><h1>Index of class methods</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_modules.html ocamlsdl-0.9.0/doc/html/index_modules.html
--- ocamlsdl-0.8.0/doc/html/index_modules.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_modules.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of modules</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of modules</title>
 </head>
 <body>
 <center><h1>Index of modules</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_module_types.html ocamlsdl-0.9.0/doc/html/index_module_types.html
--- ocamlsdl-0.8.0/doc/html/index_module_types.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_module_types.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of module types</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of module types</title>
 </head>
 <body>
 <center><h1>Index of module types</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_types.html ocamlsdl-0.9.0/doc/html/index_types.html
--- ocamlsdl-0.8.0/doc/html/index_types.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_types.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of types</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of types</title>
 </head>
 <body>
 <center><h1>Index of types</h1></center>
diff -Nru ocamlsdl-0.8.0/doc/html/index_values.html ocamlsdl-0.9.0/doc/html/index_values.html
--- ocamlsdl-0.8.0/doc/html/index_values.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/index_values.html	2012-05-28 17:53:37.000000000 +0000
@@ -19,7 +19,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Index of values</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Index of values</title>
 </head>
 <body>
 <center><h1>Index of values</h1></center>
@@ -685,6 +685,11 @@
 Load a wave file of the mixer format from a memory buffer
 </div>
 </td></tr>
+<tr><td><a href="Sdlmixer.html#VALload_string_raw">load_string_raw</a> [<a href="Sdlmixer.html">Sdlmixer</a>]</td>
+<td><div class="info">
+Load raw audio data of the mixer format from a memory buffer
+</div>
+</td></tr>
 <tr><td><a href="Sdlvideo.html#VALlock">lock</a> [<a href="Sdlvideo.html">Sdlvideo</a>]</td>
 <td><div class="info">
 Sets up a surface for directly accessing the pixels.
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlcdrom.html ocamlsdl-0.9.0/doc/html/Sdlcdrom.html
--- ocamlsdl-0.8.0/doc/html/Sdlcdrom.html	2010-04-19 20:50:49.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlcdrom.html	2012-05-28 17:53:36.000000000 +0000
@@ -27,7 +27,7 @@
 <link title="General API" rel="Section" href="#3_GeneralAPI">
 <link title="CD-ROM drive handling" rel="Section" href="#3_CDROMdrivehandling">
 <link title="Playing audio tracks " rel="Section" href="#3_Playingaudiotracks">
-<title>OCamlSDL  : Sdlcdrom</title>
+<title>OCamlSDL 0.9.0 : Sdlcdrom</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdl.html">Previous</a>
@@ -38,23 +38,22 @@
 <br>
 <pre><span class="keyword">module</span> Sdlcdrom: <code class="code">sig</code> <a href="Sdlcdrom.html">..</a> <code class="code">end</code></pre>This module provides CD-ROM handling<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDLcdrom_exception"></a>SDLcdrom_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDLcdrom_exception"><span class="keyword">exception</span> SDLcdrom_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 Exception used to report errors<br>
 </div>
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONTrayempty"></a>Trayempty</pre>
+<pre><span id="EXCEPTIONTrayempty"><span class="keyword">exception</span> Trayempty</span></pre>
 <div class="info">
 Exception to report that thre's no cd in the drive<br>
 </div>
 <br>
-<a name="3_Types"></a>
-<h3>Types</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEcdrom_drive"></a><code class="type"></code>cdrom_drive </pre>
+<span id="3_Types"><h3>Types</h3></span><br>
+<pre><span id="TYPEcdrom_drive"><span class="keyword">type</span> <code class="type"></code>cdrom_drive</span> </pre>
 <div class="info">
 abstract type for handling cdrom<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEcdrom_drive_status"></a><code class="type"></code>cdrom_drive_status = </code><table class="typetable">
+<br><code><span id="TYPEcdrom_drive_status"><span class="keyword">type</span> <code class="type"></code>cdrom_drive_status</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -88,7 +87,7 @@
 enumeration of different status cdrom drive<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEtrack_type"></a><code class="type"></code>track_type = </code><table class="typetable">
+<br><code><span id="TYPEtrack_type"><span class="keyword">type</span> <code class="type"></code>track_type</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -108,7 +107,7 @@
 the types of CD-ROM track possible<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEtrack"></a><code class="type"></code>track = {</code><table class="typetable">
+<br><code><span id="TYPEtrack"><span class="keyword">type</span> <code class="type"></code>track</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -140,7 +139,7 @@
 }
 
 
-<br><code><span class="keyword">type</span> <a name="TYPEcdrom_info"></a><code class="type"></code>cdrom_info = {</code><table class="typetable">
+<br><code><span id="TYPEcdrom_info"><span class="keyword">type</span> <code class="type"></code>cdrom_info</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -173,39 +172,36 @@
 
 
 <br>
-<a name="3_GeneralAPI"></a>
-<h3>General API</h3><br>
+<span id="3_GeneralAPI"><h3>General API</h3></span><br>
 <br>
 An SDLcdrom_exception is raised on errors<br>
-<pre><span class="keyword">val</span> <a name="VALget_num_drives"></a>get_num_drives : <code class="type">unit -> int</code></pre><div class="info">
+<pre><span id="VALget_num_drives"><span class="keyword">val</span> get_num_drives</span> : <code class="type">unit -> int</code></pre><div class="info">
 <code class="code">get_num_drives</code> returns the number of CD-ROM drives on the system<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALdrive_name"></a>drive_name : <code class="type">int -> string</code></pre><div class="info">
+<pre><span id="VALdrive_name"><span class="keyword">val</span> drive_name</span> : <code class="type">int -> string</code></pre><div class="info">
 <code class="code">drive_name drive</code> returns a human-readable, system-dependent identifier 
   for the CD-ROM. 
   <code class="code">drive</code> is the index of the drive. Drive indices start to 0 and end 
   at <code class="code">get_num_drives()-1</code>.<br>
 </div>
 <br>
-<a name="3_CDROMdrivehandling"></a>
-<h3>CD-ROM drive handling</h3><br>
-<pre><span class="keyword">val</span> <a name="VALcd_open"></a>cd_open : <code class="type">int -> <a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a></code></pre><div class="info">
+<span id="3_CDROMdrivehandling"><h3>CD-ROM drive handling</h3></span><br>
+<pre><span id="VALcd_open"><span class="keyword">val</span> cd_open</span> : <code class="type">int -> <a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a></code></pre><div class="info">
 <code class="code">cd_open drive</code> open a CD-ROM drive for access<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_close"></a>cd_close : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_close"><span class="keyword">val</span> cd_close</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
 Closes the handle for the cdrom_drive<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_status"></a>cd_status : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEcdrom_drive_status">cdrom_drive_status</a></code></pre><div class="info">
+<pre><span id="VALcd_status"><span class="keyword">val</span> cd_status</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEcdrom_drive_status">cdrom_drive_status</a></code></pre><div class="info">
 <b>Returns</b> the current status of the given drive.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_info"></a>cd_info : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEcdrom_info">cdrom_info</a></code></pre><div class="info">
+<pre><span id="VALcd_info"><span class="keyword">val</span> cd_info</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEcdrom_info">cdrom_info</a></code></pre><div class="info">
 <b>Raises</b> <code>Trayempty</code> if there's no cd in the drive<br>
 <b>Returns</b> the table of contents of the CD and current play position<br>
 </div>
 <br>
-<a name="3_Playingaudiotracks"></a>
-<h3>Playing audio tracks </h3><br>
-<pre><span class="keyword">val</span> <a name="VALmsf_of_frames"></a>msf_of_frames : <code class="type">int -> int * int * int</code></pre><pre><span class="keyword">val</span> <a name="VALframes_of_msf"></a>frames_of_msf : <code class="type">int * int * int -> int</code></pre><pre><span class="keyword">val</span> <a name="VALcd_play_tracks"></a>cd_play_tracks : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -><br>       start_track:int -><br>       start_frame:int -> num_tracks:int -> num_frames:int -> unit</code></pre><div class="info">
+<span id="3_Playingaudiotracks"><h3>Playing audio tracks </h3></span><br>
+<pre><span id="VALmsf_of_frames"><span class="keyword">val</span> msf_of_frames</span> : <code class="type">int -> int * int * int</code></pre><pre><span id="VALframes_of_msf"><span class="keyword">val</span> frames_of_msf</span> : <code class="type">int * int * int -> int</code></pre><pre><span id="VALcd_play_tracks"><span class="keyword">val</span> cd_play_tracks</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -><br>       start_track:int -><br>       start_frame:int -> num_tracks:int -> num_frames:int -> unit</code></pre><div class="info">
 <code class="code">cd_play_tracks cdrom_drive start_track start_frame num_tracks num_frames</code> 
   play the given CD with these parameters<br>
 <b>Raises</b> <code>Trayempty</code> if there's no cd in the drive<br>
@@ -214,19 +210,19 @@
 <div class="param_info"><code class="code">start_frame</code> : the starting frame</div>
 <div class="param_info"><code class="code">num_tracks</code> : the number of tracks to play</div>
 <div class="param_info"><code class="code">num_frames</code> : the number of frames to play</div>
-<pre><span class="keyword">val</span> <a name="VALcd_play_track"></a>cd_play_track : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEtrack">track</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_play_track"><span class="keyword">val</span> cd_play_track</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> <a href="Sdlcdrom.html#TYPEtrack">track</a> -> unit</code></pre><div class="info">
 Play the track n on the given cdrom_drive<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_pause"></a>cd_pause : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_pause"><span class="keyword">val</span> cd_pause</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
 Pause play<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_resume"></a>cd_resume : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_resume"><span class="keyword">val</span> cd_resume</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
 Resume play<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_stop"></a>cd_stop : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_stop"><span class="keyword">val</span> cd_stop</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
 Stop play<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcd_eject"></a>cd_eject : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
+<pre><span id="VALcd_eject"><span class="keyword">val</span> cd_eject</span> : <code class="type"><a href="Sdlcdrom.html#TYPEcdrom_drive">cdrom_drive</a> -> unit</code></pre><div class="info">
 Eject CD-ROM<br>
 </div>
 </body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlevent.html ocamlsdl-0.9.0/doc/html/Sdlevent.html
--- ocamlsdl-0.8.0/doc/html/Sdlevent.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlevent.html	2012-05-28 17:53:36.000000000 +0000
@@ -29,7 +29,7 @@
 <link title="Enabling/Disabling event collecting" rel="Section" href="#3_EnablingDisablingeventcollecting">
 <link title="Handling events" rel="Section" href="#3_Handlingevents">
 <link title="Old event-handling interface " rel="Section" href="#3_Oldeventhandlinginterface">
-<title>OCamlSDL  : Sdlevent</title>
+<title>OCamlSDL 0.9.0 : Sdlevent</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlmouse.html">Previous</a>
@@ -40,14 +40,13 @@
 <br>
 <pre><span class="keyword">module</span> Sdlevent: <code class="code">sig</code> <a href="Sdlevent.html">..</a> <code class="code">end</code></pre>SDL event handling<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONEvent_exn"></a>Event_exn <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONEvent_exn"><span class="keyword">exception</span> Event_exn</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 The exception used for reporting events-related errors.<br>
 </div>
 <br>
-<a name="3_Applicationfocus"></a>
-<h3>Application focus</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEactive_state"></a><code class="type"></code>active_state = </code><table class="typetable">
+<span id="3_Applicationfocus"><h3>Application focus</h3></span><br>
+<br><code><span id="TYPEactive_state"><span class="keyword">type</span> <code class="type"></code>active_state</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -74,15 +73,14 @@
 The available application states<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALget_app_state"></a>get_app_state : <code class="type">unit -> <a href="Sdlevent.html#TYPEactive_state">active_state</a> list</code></pre><div class="info">
+<pre><span id="VALget_app_state"><span class="keyword">val</span> get_app_state</span> : <code class="type">unit -> <a href="Sdlevent.html#TYPEactive_state">active_state</a> list</code></pre><div class="info">
 This function returns the current state of the application. If
    ACTIVE is set, then the user is able to see your application,
    otherwise it has been iconified or disabled.<br>
 </div>
 <br>
-<a name="3_Eventsdatatypes"></a>
-<h3>Events datatypes</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEactive_event"></a><code class="type"></code>active_event = {</code><table class="typetable">
+<span id="3_Eventsdatatypes"><h3>Events datatypes</h3></span><br>
+<br><code><span id="TYPEactive_event"><span class="keyword">type</span> <code class="type"></code>active_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -103,7 +101,7 @@
 Application visibility event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEswitch_state"></a><code class="type"></code>switch_state = </code><table class="typetable">
+<br><code><span id="TYPEswitch_state"><span class="keyword">type</span> <code class="type"></code>switch_state</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -120,7 +118,7 @@
 </tr></table>
 
 
-<br><code><span class="keyword">type</span> <a name="TYPEkeyboard_event"></a><code class="type"></code>keyboard_event = {</code><table class="typetable">
+<br><code><span id="TYPEkeyboard_event"><span class="keyword">type</span> <code class="type"></code>keyboard_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -169,7 +167,7 @@
 Keyboard event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEmousemotion_event"></a><code class="type"></code>mousemotion_event = {</code><table class="typetable">
+<br><code><span id="TYPEmousemotion_event"><span class="keyword">type</span> <code class="type"></code>mousemotion_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -218,7 +216,7 @@
 Mouse motion event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEmousebutton_event"></a><code class="type"></code>mousebutton_event = {</code><table class="typetable">
+<br><code><span id="TYPEmousebutton_event"><span class="keyword">type</span> <code class="type"></code>mousebutton_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -260,7 +258,7 @@
 Mouse button event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEjoyaxis_event"></a><code class="type"></code>joyaxis_event = {</code><table class="typetable">
+<br><code><span id="TYPEjoyaxis_event"><span class="keyword">type</span> <code class="type"></code>joyaxis_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -288,7 +286,7 @@
 Joystick axis motion event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEjoyball_event"></a><code class="type"></code>joyball_event = {</code><table class="typetable">
+<br><code><span id="TYPEjoyball_event"><span class="keyword">type</span> <code class="type"></code>joyball_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -323,7 +321,7 @@
 Joystick axis motion event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEjoyhat_event"></a><code class="type"></code>joyhat_event = {</code><table class="typetable">
+<br><code><span id="TYPEjoyhat_event"><span class="keyword">type</span> <code class="type"></code>joyhat_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -354,7 +352,7 @@
 Joystick hat position change event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEjoybutton_event"></a><code class="type"></code>joybutton_event = {</code><table class="typetable">
+<br><code><span id="TYPEjoybutton_event"><span class="keyword">type</span> <code class="type"></code>joybutton_event</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -382,7 +380,7 @@
 Joystick button event record<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEevent"></a><code class="type"></code>event = </code><table class="typetable">
+<br><code><span id="TYPEevent"><span class="keyword">type</span> <code class="type"></code>event</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -500,18 +498,17 @@
 The main event type<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALstring_of_event"></a>string_of_event : <code class="type"><a href="Sdlevent.html#TYPEevent">event</a> -> string</code></pre><div class="info">
+<pre><span id="VALstring_of_event"><span class="keyword">val</span> string_of_event</span> : <code class="type"><a href="Sdlevent.html#TYPEevent">event</a> -> string</code></pre><div class="info">
 Returns a short string descriptive of the event type, for debugging<br>
 </div>
 <br>
-<a name="3_Eventmasks"></a>
-<h3>Event masks </h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEevent_mask"></a><code class="type"></code>event_mask = <code class="type">int</code> </pre>
+<span id="3_Eventmasks"><h3>Event masks </h3></span><br>
+<pre><span id="TYPEevent_mask"><span class="keyword">type</span> <code class="type"></code>event_mask</span> = <code class="type">int</code> </pre>
 
 <br>
 Event masks values are ints and should be manipulated with <code class="code">lor</code>,
    <code class="code">land</code>, etc.<br>
-<pre><span class="keyword">val</span> <a name="VALactive_mask"></a>active_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALkeydown_mask"></a>keydown_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALkeyup_mask"></a>keyup_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALmousemotion_mask"></a>mousemotion_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALmousebuttondown_mask"></a>mousebuttondown_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALmousebuttonup_mask"></a>mousebuttonup_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoyaxismotion_mask"></a>joyaxismotion_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoyballmotion_mask"></a>joyballmotion_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoyhatmotion_mask"></a>joyhatmotion_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoybuttondown_mask"></a>joybuttondown_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoybuttonup_mask"></a>joybuttonup_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALquit_mask"></a>quit_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALsyswmevent_mask"></a>syswmevent_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALvideoresize_mask"></a>videoresize_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALvideoexpose_mask"></a>videoexpose_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALuserevent_mask"></a>userevent_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALkeyboard_event_mask"></a>keyboard_event_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALmouse_event_mask"></a>mouse_event_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALjoystick_event_mask"></a>joystick_event_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALall_events_mask"></a>all_events_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><br><code><span class="keyword">type</span> <a name="TYPEevent_kind"></a><code class="type"></code>event_kind = </code><table class="typetable">
+<pre><span id="VALactive_mask"><span class="keyword">val</span> active_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALkeydown_mask"><span class="keyword">val</span> keydown_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALkeyup_mask"><span class="keyword">val</span> keyup_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALmousemotion_mask"><span class="keyword">val</span> mousemotion_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALmousebuttondown_mask"><span class="keyword">val</span> mousebuttondown_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALmousebuttonup_mask"><span class="keyword">val</span> mousebuttonup_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoyaxismotion_mask"><span class="keyword">val</span> joyaxismotion_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoyballmotion_mask"><span class="keyword">val</span> joyballmotion_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoyhatmotion_mask"><span class="keyword">val</span> joyhatmotion_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoybuttondown_mask"><span class="keyword">val</span> joybuttondown_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoybuttonup_mask"><span class="keyword">val</span> joybuttonup_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALquit_mask"><span class="keyword">val</span> quit_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALsyswmevent_mask"><span class="keyword">val</span> syswmevent_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALvideoresize_mask"><span class="keyword">val</span> videoresize_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALvideoexpose_mask"><span class="keyword">val</span> videoexpose_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALuserevent_mask"><span class="keyword">val</span> userevent_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALkeyboard_event_mask"><span class="keyword">val</span> keyboard_event_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALmouse_event_mask"><span class="keyword">val</span> mouse_event_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALjoystick_event_mask"><span class="keyword">val</span> joystick_event_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALall_events_mask"><span class="keyword">val</span> all_events_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><br><code><span id="TYPEevent_kind"><span class="keyword">type</span> <code class="type"></code>event_kind</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -626,63 +623,60 @@
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALmake_mask"></a>make_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_kind">event_kind</a> list -> <a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span class="keyword">val</span> <a name="VALof_mask"></a>of_mask : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> <a href="Sdlevent.html#TYPEevent_kind">event_kind</a> list</code></pre><br>
-<a name="3_EnablingDisablingeventcollecting"></a>
-<h3>Enabling/Disabling event collecting</h3><br>
-<pre><span class="keyword">val</span> <a name="VALenable_events"></a>enable_events : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> unit</code></pre><div class="info">
+<pre><span id="VALmake_mask"><span class="keyword">val</span> make_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_kind">event_kind</a> list -> <a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><pre><span id="VALof_mask"><span class="keyword">val</span> of_mask</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> <a href="Sdlevent.html#TYPEevent_kind">event_kind</a> list</code></pre><br>
+<span id="3_EnablingDisablingeventcollecting"><h3>Enabling/Disabling event collecting</h3></span><br>
+<pre><span id="VALenable_events"><span class="keyword">val</span> enable_events</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> unit</code></pre><div class="info">
 Specified events are collected and added to the event queue (when
    <code class="code">pump</code> is called).<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALdisable_events"></a>disable_events : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> unit</code></pre><div class="info">
+<pre><span id="VALdisable_events"><span class="keyword">val</span> disable_events</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> unit</code></pre><div class="info">
 Specified events are not collected and won't appear in the event queue.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_enabled_events"></a>get_enabled_events : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><div class="info">
+<pre><span id="VALget_enabled_events"><span class="keyword">val</span> get_enabled_events</span> : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent_mask">event_mask</a></code></pre><div class="info">
 The mask of currently reported events.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_state"></a>get_state : <code class="type"><a href="Sdlevent.html#TYPEevent_kind">event_kind</a> -> bool</code></pre><div class="info">
+<pre><span id="VALget_state"><span class="keyword">val</span> get_state</span> : <code class="type"><a href="Sdlevent.html#TYPEevent_kind">event_kind</a> -> bool</code></pre><div class="info">
 Query the reporting state of an event type.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_state"></a>set_state : <code class="type">bool -> <a href="Sdlevent.html#TYPEevent_kind">event_kind</a> -> unit</code></pre><div class="info">
+<pre><span id="VALset_state"><span class="keyword">val</span> set_state</span> : <code class="type">bool -> <a href="Sdlevent.html#TYPEevent_kind">event_kind</a> -> unit</code></pre><div class="info">
 Set the reporting state of one individual event type.<br>
 </div>
 <br>
-<a name="3_Handlingevents"></a>
-<h3>Handling events</h3><br>
-<pre><span class="keyword">val</span> <a name="VALpump"></a>pump : <code class="type">unit -> unit</code></pre><div class="info">
+<span id="3_Handlingevents"><h3>Handling events</h3></span><br>
+<pre><span id="VALpump"><span class="keyword">val</span> pump</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Pumps the event loop, gathering events from the input devices.
    This function updates the event queue and internal input device
    state.  This should only be run in the thread that sets the video
    mode.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALwait_event"></a>wait_event : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent">event</a></code></pre><div class="info">
+<pre><span id="VALwait_event"><span class="keyword">val</span> wait_event</span> : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent">event</a></code></pre><div class="info">
 Wait indefinitely for the next available event and return it.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALwait"></a>wait : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALwait"><span class="keyword">val</span> wait</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Wait indefinitely for the next available event but leave it in the
    queue.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALpoll"></a>poll : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent">event</a> option</code></pre><div class="info">
+<pre><span id="VALpoll"><span class="keyword">val</span> poll</span> : <code class="type">unit -> <a href="Sdlevent.html#TYPEevent">event</a> option</code></pre><div class="info">
 Poll for currently pending events and return one if available.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALhas_event"></a>has_event : <code class="type">unit -> bool</code></pre><div class="info">
+<pre><span id="VALhas_event"><span class="keyword">val</span> has_event</span> : <code class="type">unit -> bool</code></pre><div class="info">
 Poll for currently pending events and return <code class="code">false</code> if the queue is empty.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALpeek"></a>peek : <code class="type">?mask:<a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> int -> <a href="Sdlevent.html#TYPEevent">event</a> list</code></pre><div class="info">
+<pre><span id="VALpeek"><span class="keyword">val</span> peek</span> : <code class="type">?mask:<a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> int -> <a href="Sdlevent.html#TYPEevent">event</a> list</code></pre><div class="info">
 Checks the event queue for messages : up to 'numevents' events at
    the front of the event queue, matching 'mask', will be returned and
    will not be removed from the queue.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget"></a>get : <code class="type">?mask:<a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> int -> <a href="Sdlevent.html#TYPEevent">event</a> list</code></pre><div class="info">
+<pre><span id="VALget"><span class="keyword">val</span> get</span> : <code class="type">?mask:<a href="Sdlevent.html#TYPEevent_mask">event_mask</a> -> int -> <a href="Sdlevent.html#TYPEevent">event</a> list</code></pre><div class="info">
 Checks the event queue for messages : up to 'numevents' events at
    the front of the event queue, matching 'mask', will be returned and
    will be removed from the queue.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALadd"></a>add : <code class="type"><a href="Sdlevent.html#TYPEevent">event</a> list -> unit</code></pre><div class="info">
+<pre><span id="VALadd"><span class="keyword">val</span> add</span> : <code class="type"><a href="Sdlevent.html#TYPEevent">event</a> list -> unit</code></pre><div class="info">
 Add events to the back of the event queue.<br>
 </div>
 <br>
-<a name="3_Oldeventhandlinginterface"></a>
-<h3>Old event-handling interface </h3><br>
+<span id="3_Oldeventhandlinginterface"><h3>Old event-handling interface </h3></span><br>
 <pre><span class="keyword">module</span> <a href="Sdlevent.Old.html">Old</a>: <code class="code">sig</code> <a href="Sdlevent.Old.html">..</a> <code class="code">end</code></pre><div class="info">
 <font color="#CCCCCC">Callback-based event handling.
 </font></div>
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlevent.Old.html ocamlsdl-0.9.0/doc/html/Sdlevent.Old.html
--- ocamlsdl-0.8.0/doc/html/Sdlevent.Old.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlevent.Old.html	2012-05-28 17:53:36.000000000 +0000
@@ -24,7 +24,7 @@
 <link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><link title="Definition of the event callbacks" rel="Section" href="#4_Definitionoftheeventcallbacks">
 <link title="Functions for setting the current event callbacks" rel="Section" href="#4_Functionsforsettingthecurrenteventcallbacks">
 <link title="Event loop" rel="Section" href="#4_Eventloop">
-<title>OCamlSDL  : Sdlevent.Old</title>
+<title>OCamlSDL 0.9.0 : Sdlevent.Old</title>
 </head>
 <body>
 <div class="navbar">&nbsp;<a href="Sdlevent.html">Up</a>
@@ -35,34 +35,31 @@
 Callback-based event handling.<br>
 <hr width="100%">
 <br>
-<a name="4_Definitionoftheeventcallbacks"></a>
-<h4>Definition of the event callbacks</h4><br>
-<pre><span class="keyword">type</span> <a name="TYPEkeyboard_event_func"></a><code class="type"></code>keyboard_event_func = <code class="type"><a href="Sdlkey.html#TYPEt">Sdlkey.t</a> -> <a href="Sdlevent.html#TYPEswitch_state">Sdlevent.switch_state</a> -> int -> int -> unit</code> </pre>
+<span id="4_Definitionoftheeventcallbacks"><h4>Definition of the event callbacks</h4></span><br>
+<pre><span id="TYPEkeyboard_event_func"><span class="keyword">type</span> <code class="type"></code>keyboard_event_func</span> = <code class="type"><a href="Sdlkey.html#TYPEt">Sdlkey.t</a> -> <a href="Sdlevent.html#TYPEswitch_state">Sdlevent.switch_state</a> -> int -> int -> unit</code> </pre>
 <div class="info">
 Keyboard event called with the activated key, its state and the
    coordinates of the mouse pointer<br>
 </div>
 
-<pre><span class="keyword">type</span> <a name="TYPEmouse_event_func"></a><code class="type"></code>mouse_event_func = <code class="type"><a href="Sdlmouse.html#TYPEbutton">Sdlmouse.button</a> -> <a href="Sdlevent.html#TYPEswitch_state">Sdlevent.switch_state</a> -> int -> int -> unit</code> </pre>
+<pre><span id="TYPEmouse_event_func"><span class="keyword">type</span> <code class="type"></code>mouse_event_func</span> = <code class="type"><a href="Sdlmouse.html#TYPEbutton">Sdlmouse.button</a> -> <a href="Sdlevent.html#TYPEswitch_state">Sdlevent.switch_state</a> -> int -> int -> unit</code> </pre>
 <div class="info">
 Mouse button event called with the activated button, its state
    and the coordinates of the mouse pointer<br>
 </div>
 
-<pre><span class="keyword">type</span> <a name="TYPEmousemotion_event_func"></a><code class="type"></code>mousemotion_event_func = <code class="type">int -> int -> unit</code> </pre>
+<pre><span id="TYPEmousemotion_event_func"><span class="keyword">type</span> <code class="type"></code>mousemotion_event_func</span> = <code class="type">int -> int -> unit</code> </pre>
 <div class="info">
 Mouse motion event called with the coordinates of the mouse
   pointer<br>
 </div>
 
-<pre><span class="keyword">type</span> <a name="TYPEidle_event_func"></a><code class="type"></code>idle_event_func = <code class="type">unit -> unit</code> </pre>
+<pre><span id="TYPEidle_event_func"><span class="keyword">type</span> <code class="type"></code>idle_event_func</span> = <code class="type">unit -> unit</code> </pre>
 
-<pre><span class="keyword">type</span> <a name="TYPEresize_event_func"></a><code class="type"></code>resize_event_func = <code class="type">int -> int -> unit</code> </pre>
+<pre><span id="TYPEresize_event_func"><span class="keyword">type</span> <code class="type"></code>resize_event_func</span> = <code class="type">int -> int -> unit</code> </pre>
 
 <br>
-<a name="4_Functionsforsettingthecurrenteventcallbacks"></a>
-<h4>Functions for setting the current event callbacks</h4><br>
-<pre><span class="keyword">val</span> <a name="VALset_keyboard_event_func"></a>set_keyboard_event_func : <code class="type"><a href="Sdlevent.Old.html#TYPEkeyboard_event_func">keyboard_event_func</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_mouse_event_func"></a>set_mouse_event_func : <code class="type"><a href="Sdlevent.Old.html#TYPEmouse_event_func">mouse_event_func</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_mousemotion_event_func"></a>set_mousemotion_event_func : <code class="type"><a href="Sdlevent.Old.html#TYPEmousemotion_event_func">mousemotion_event_func</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_idle_event_func"></a>set_idle_event_func : <code class="type"><a href="Sdlevent.Old.html#TYPEidle_event_func">idle_event_func</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_resize_event_func"></a>set_resize_event_func : <code class="type"><a href="Sdlevent.Old.html#TYPEresize_event_func">resize_event_func</a> -> unit</code></pre><br>
-<a name="4_Eventloop"></a>
-<h4>Event loop</h4><br>
-<pre><span class="keyword">val</span> <a name="VALstart_event_loop"></a>start_event_loop : <code class="type">unit -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALexit_event_loop"></a>exit_event_loop : <code class="type">unit -> unit</code></pre></body></html>
\ No newline at end of file
+<span id="4_Functionsforsettingthecurrenteventcallbacks"><h4>Functions for setting the current event callbacks</h4></span><br>
+<pre><span id="VALset_keyboard_event_func"><span class="keyword">val</span> set_keyboard_event_func</span> : <code class="type"><a href="Sdlevent.Old.html#TYPEkeyboard_event_func">keyboard_event_func</a> -> unit</code></pre><pre><span id="VALset_mouse_event_func"><span class="keyword">val</span> set_mouse_event_func</span> : <code class="type"><a href="Sdlevent.Old.html#TYPEmouse_event_func">mouse_event_func</a> -> unit</code></pre><pre><span id="VALset_mousemotion_event_func"><span class="keyword">val</span> set_mousemotion_event_func</span> : <code class="type"><a href="Sdlevent.Old.html#TYPEmousemotion_event_func">mousemotion_event_func</a> -> unit</code></pre><pre><span id="VALset_idle_event_func"><span class="keyword">val</span> set_idle_event_func</span> : <code class="type"><a href="Sdlevent.Old.html#TYPEidle_event_func">idle_event_func</a> -> unit</code></pre><pre><span id="VALset_resize_event_func"><span class="keyword">val</span> set_resize_event_func</span> : <code class="type"><a href="Sdlevent.Old.html#TYPEresize_event_func">resize_event_func</a> -> unit</code></pre><br>
+<span id="4_Eventloop"><h4>Event loop</h4></span><br>
+<pre><span id="VALstart_event_loop"><span class="keyword">val</span> start_event_loop</span> : <code class="type">unit -> unit</code></pre><pre><span id="VALexit_event_loop"><span class="keyword">val</span> exit_event_loop</span> : <code class="type">unit -> unit</code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlgfx.html ocamlsdl-0.9.0/doc/html/Sdlgfx.html
--- ocamlsdl-0.8.0/doc/html/Sdlgfx.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlgfx.html	2012-05-28 17:53:37.000000000 +0000
@@ -22,7 +22,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlgfx</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlgfx</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlmixer.html">Previous</a>
@@ -31,4 +31,4 @@
 <center><h1>Module <a href="type_Sdlgfx.html">Sdlgfx</a></h1></center>
 <br>
 <pre><span class="keyword">module</span> Sdlgfx: <code class="code">sig</code> <a href="Sdlgfx.html">..</a> <code class="code">end</code></pre><hr width="100%">
-<pre><span class="keyword">val</span> <a name="VALpixelColor"></a>pixelColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> int -> int -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALpixelRGBA"></a>pixelRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> int -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALrectangleColor"></a>rectangleColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALrectangleRGBA"></a>rectangleRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALboxColor"></a>boxColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALboxRGBA"></a>boxRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALlineColor"></a>lineColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALlineRGBA"></a>lineRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaalineColor"></a>aalineColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaalineRGBA"></a>aalineRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALcircleColor"></a>circleColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALcircleRGBA"></a>circleRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaacircleColor"></a>aacircleColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaacircleRGBA"></a>aacircleRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfilledCircleColor"></a>filledCircleColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfilledCircleRGBA"></a>filledCircleRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALellipseColor"></a>ellipseColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALellipseRGBA"></a>ellipseRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaaellipseColor"></a>aaellipseColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALaaellipseRGBA"></a>aaellipseRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfilledEllipseColor"></a>filledEllipseColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfilledEllipseRGBA"></a>filledEllipseRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALcharacterColor"></a>characterColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> char -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALcharacterRGBA"></a>characterRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> char -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALstringColor"></a>stringColor : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> string -> int32 -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALstringRGBA"></a>stringRGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> string -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALgfxPrimitivesSetFont"></a>gfxPrimitivesSetFont : <code class="type">string -> int -> int -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALrotozoomSurface"></a>rotozoomSurface : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrotozoomSurfaceXY"></a>rotozoomSurfaceXY : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALzoomSurface"></a>zoomSurface : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre></body></html>
\ No newline at end of file
+<pre><span id="VALpixelColor"><span class="keyword">val</span> pixelColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> int -> int -> int32 -> bool</code></pre><pre><span id="VALpixelRGBA"><span class="keyword">val</span> pixelRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> int -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALrectangleColor"><span class="keyword">val</span> rectangleColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALrectangleRGBA"><span class="keyword">val</span> rectangleRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALboxColor"><span class="keyword">val</span> boxColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALboxRGBA"><span class="keyword">val</span> boxRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALlineColor"><span class="keyword">val</span> lineColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALlineRGBA"><span class="keyword">val</span> lineRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALaalineColor"><span class="keyword">val</span> aalineColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALaalineRGBA"><span class="keyword">val</span> aalineRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALcircleColor"><span class="keyword">val</span> circleColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span id="VALcircleRGBA"><span class="keyword">val</span> circleRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALaacircleColor"><span class="keyword">val</span> aacircleColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span id="VALaacircleRGBA"><span class="keyword">val</span> aacircleRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALfilledCircleColor"><span class="keyword">val</span> filledCircleColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> int32 -> bool</code></pre><pre><span id="VALfilledCircleRGBA"><span class="keyword">val</span> filledCircleRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALellipseColor"><span class="keyword">val</span> ellipseColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALellipseRGBA"><span class="keyword">val</span> ellipseRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALaaellipseColor"><span class="keyword">val</span> aaellipseColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALaaellipseRGBA"><span class="keyword">val</span> aaellipseRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALfilledEllipseColor"><span class="keyword">val</span> filledEllipseColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> int32 -> bool</code></pre><pre><span id="VALfilledEllipseRGBA"><span class="keyword">val</span> filledEllipseRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -><br>       <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALcharacterColor"><span class="keyword">val</span> characterColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> char -> int32 -> bool</code></pre><pre><span id="VALcharacterRGBA"><span class="keyword">val</span> characterRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> char -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALstringColor"><span class="keyword">val</span> stringColor</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> string -> int32 -> bool</code></pre><pre><span id="VALstringRGBA"><span class="keyword">val</span> stringRGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> <a href="Sdlvideo.html#TYPErect">Sdlvideo.rect</a> -> string -> <a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> int -> bool</code></pre><pre><span id="VALgfxPrimitivesSetFont"><span class="keyword">val</span> gfxPrimitivesSetFont</span> : <code class="type">string -> int -> int -> unit</code></pre><pre><span id="VALrotozoomSurface"><span class="keyword">val</span> rotozoomSurface</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrotozoomSurfaceXY"><span class="keyword">val</span> rotozoomSurfaceXY</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALzoomSurface"><span class="keyword">val</span> zoomSurface</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> float -> float -> bool -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdl.html ocamlsdl-0.9.0/doc/html/Sdl.html
--- ocamlsdl-0.8.0/doc/html/Sdl.html	2010-04-19 20:50:49.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdl.html	2012-05-28 17:53:36.000000000 +0000
@@ -25,7 +25,7 @@
 <link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><link title="Main functions" rel="Section" href="#3_Mainfunctions">
 <link title="Versioning information" rel="Section" href="#3_Versioninginformation">
 <link title="Environment variables" rel="Section" href="#3_Environmentvariables">
-<title>OCamlSDL  : Sdl</title>
+<title>OCamlSDL 0.9.0 : Sdl</title>
 </head>
 <body>
 <div class="navbar">&nbsp;<a href="index.html">Up</a>
@@ -35,19 +35,18 @@
 <br>
 <pre><span class="keyword">module</span> Sdl: <code class="code">sig</code> <a href="Sdl.html">..</a> <code class="code">end</code></pre>This module contains functions for initializing/quitting the library<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDL_init_exception"></a>SDL_init_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDL_init_exception"><span class="keyword">exception</span> SDL_init_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 Exception for reporting errors during initialization<br>
 </div>
 <br>
-<a name="3_Mainfunctions"></a>
-<h3>Main functions</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEsubsystem"></a><code class="type"></code>subsystem = <code class="type">[ `AUDIO | `CDROM | `JOYSTICK | `TIMER | `VIDEO ]</code> </pre>
+<span id="3_Mainfunctions"><h3>Main functions</h3></span><br>
+<pre><span id="TYPEsubsystem"><span class="keyword">type</span> <code class="type"></code>subsystem</span> = <code class="type">[ `AUDIO | `CDROM | `JOYSTICK | `TIMER | `VIDEO ]</code> </pre>
 <div class="info">
 Initialization flag type<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALinit"></a>init : <code class="type">?auto_clean:bool -><br>       [< `AUDIO<br>        | `CDROM<br>        | `EVENTTHREAD<br>        | `EVERYTHING<br>        | `JOYSTICK<br>        | `NOPARACHUTE<br>        | `TIMER<br>        | `VIDEO ]<br>       list -> unit</code></pre><div class="info">
+<pre><span id="VALinit"><span class="keyword">val</span> init</span> : <code class="type">?auto_clean:bool -><br>       [< `AUDIO<br>        | `CDROM<br>        | `EVENTTHREAD<br>        | `EVERYTHING<br>        | `JOYSTICK<br>        | `NOPARACHUTE<br>        | `TIMER<br>        | `VIDEO ]<br>       list -> unit</code></pre><div class="info">
 Initialize the SDL library. This should be called before all other 
    SDL functions. 
    The flags parameter specifies what part(s) of SDL to initialize.<ul>
@@ -57,14 +56,13 @@
 </ul>
 <br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALinit_subsystem"></a>init_subsystem : <code class="type"><a href="Sdl.html#TYPEsubsystem">subsystem</a> list -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALwas_init"></a>was_init : <code class="type">unit -> <a href="Sdl.html#TYPEsubsystem">subsystem</a> list</code></pre><pre><span class="keyword">val</span> <a name="VALquit"></a>quit : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALinit_subsystem"><span class="keyword">val</span> init_subsystem</span> : <code class="type"><a href="Sdl.html#TYPEsubsystem">subsystem</a> list -> unit</code></pre><pre><span id="VALwas_init"><span class="keyword">val</span> was_init</span> : <code class="type">unit -> <a href="Sdl.html#TYPEsubsystem">subsystem</a> list</code></pre><pre><span id="VALquit"><span class="keyword">val</span> quit</span> : <code class="type">unit -> unit</code></pre><div class="info">
 <code class="code">quit</code> shuts down all SDL subsystems and frees the resources allocated 
   to them. This should always be called before you exit.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALquit_subsystem"></a>quit_subsystem : <code class="type"><a href="Sdl.html#TYPEsubsystem">subsystem</a> list -> unit</code></pre><br>
-<a name="3_Versioninginformation"></a>
-<h3>Versioning information</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEversion"></a><code class="type"></code>version = {</code><table class="typetable">
+<pre><span id="VALquit_subsystem"><span class="keyword">val</span> quit_subsystem</span> : <code class="type"><a href="Sdl.html#TYPEsubsystem">subsystem</a> list -> unit</code></pre><br>
+<span id="3_Versioninginformation"><h3>Versioning information</h3></span><br>
+<br><code><span id="TYPEversion"><span class="keyword">type</span> <code class="type"></code>version</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -89,10 +87,9 @@
 }
 
 
-<pre><span class="keyword">val</span> <a name="VALversion"></a>version : <code class="type">unit -> <a href="Sdl.html#TYPEversion">version</a></code></pre><div class="info">
+<pre><span id="VALversion"><span class="keyword">val</span> version</span> : <code class="type">unit -> <a href="Sdl.html#TYPEversion">version</a></code></pre><div class="info">
 version of the SDL library<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALstring_of_version"></a>string_of_version : <code class="type"><a href="Sdl.html#TYPEversion">version</a> -> string</code></pre><br>
-<a name="3_Environmentvariables"></a>
-<h3>Environment variables</h3><br>
-<pre><span class="keyword">val</span> <a name="VALgetenv"></a>getenv : <code class="type">string -> string</code></pre><pre><span class="keyword">val</span> <a name="VALputenv"></a>putenv : <code class="type">string -> string -> unit</code></pre></body></html>
\ No newline at end of file
+<pre><span id="VALstring_of_version"><span class="keyword">val</span> string_of_version</span> : <code class="type"><a href="Sdl.html#TYPEversion">version</a> -> string</code></pre><br>
+<span id="3_Environmentvariables"><h3>Environment variables</h3></span><br>
+<pre><span id="VALgetenv"><span class="keyword">val</span> getenv</span> : <code class="type">string -> string</code></pre><pre><span id="VALputenv"><span class="keyword">val</span> putenv</span> : <code class="type">string -> string -> unit</code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdljoystick.html ocamlsdl-0.9.0/doc/html/Sdljoystick.html
--- ocamlsdl-0.8.0/doc/html/Sdljoystick.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdljoystick.html	2012-05-28 17:53:36.000000000 +0000
@@ -24,7 +24,7 @@
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
 <link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><link title="Joystick state " rel="Section" href="#3_Joystickstate">
-<title>OCamlSDL  : Sdljoystick</title>
+<title>OCamlSDL 0.9.0 : Sdljoystick</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdltimer.html">Previous</a>
@@ -39,52 +39,51 @@
 In order to use these functions, <a href="Sdl.html#VALinit"><code class="code">Sdl.init</code></a> must have been called
    with the `JOYSTICK flag.  This causes SDL to scan the system
    for joysticks, and load appropriate drivers.<br>
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDLjoystick_exception"></a>SDLjoystick_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDLjoystick_exception"><span class="keyword">exception</span> SDLjoystick_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 exception for error reporting<br>
 </div>
-<pre><span class="keyword">type</span> <a name="TYPEt"></a><code class="type"></code>t </pre>
+<pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre>
 <div class="info">
 The joystick abstract type used to identify an SDL joystick<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALnum_joysticks"></a>num_joysticks : <code class="type">unit -> int</code></pre><div class="info">
+<pre><span id="VALnum_joysticks"><span class="keyword">val</span> num_joysticks</span> : <code class="type">unit -> int</code></pre><div class="info">
 Count the number of joysticks attached to the system<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALname"></a>name : <code class="type">int -> string</code></pre><div class="info">
+<pre><span id="VALname"><span class="keyword">val</span> name</span> : <code class="type">int -> string</code></pre><div class="info">
 Get the implementation dependent name of a joystick.
    This can be called before any joysticks are opened.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALopen_joystick"></a>open_joystick : <code class="type">int -> <a href="Sdljoystick.html#TYPEt">t</a></code></pre><div class="info">
+<pre><span id="VALopen_joystick"><span class="keyword">val</span> open_joystick</span> : <code class="type">int -> <a href="Sdljoystick.html#TYPEt">t</a></code></pre><div class="info">
 Open a joystick for use - the index passed as an argument refers to
    the N'th joystick on the system.  This index is the value which will
    identify this joystick in future joystick events.<br>
 <b>Raises</b> <code>SDLjoystick_exception</code> if an error occurred<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALopened"></a>opened : <code class="type">int -> bool</code></pre><div class="info">
+<pre><span id="VALopened"><span class="keyword">val</span> opened</span> : <code class="type">int -> bool</code></pre><div class="info">
 <b>Returns</b> <code class="code">true</code> if joystick has been opened<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALindex"></a>index : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALindex"><span class="keyword">val</span> index</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
 Get the device index of an opened joystick<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_axes"></a>num_axes : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALnum_axes"><span class="keyword">val</span> num_axes</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
 Get the number of general axis controls on a joystick<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_balls"></a>num_balls : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALnum_balls"><span class="keyword">val</span> num_balls</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
 Get the number of trackballs on a joystick
    Joystick trackballs have only relative motion events associated
    with them and their state cannot be polled.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_hats"></a>num_hats : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALnum_hats"><span class="keyword">val</span> num_hats</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
 Get the number of POV hats on a joystick<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_buttons"></a>num_buttons : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALnum_buttons"><span class="keyword">val</span> num_buttons</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int</code></pre><div class="info">
 Get the number of buttons on a joystick<br>
 </div>
 <br>
-<a name="3_Joystickstate"></a>
-<h3>Joystick state </h3><br>
-<pre><span class="keyword">val</span> <a name="VALupdate"></a>update : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> unit</code></pre><div class="info">
+<span id="3_Joystickstate"><h3>Joystick state </h3></span><br>
+<pre><span id="VALupdate"><span class="keyword">val</span> update</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> unit</code></pre><div class="info">
 Update the current state of the open joysticks.
    This is called automatically by the event loop if any joystick
    events are enabled.<br>
@@ -94,9 +93,9 @@
    If joystick events are disabled, you must call <a href="Sdljoystick.html#VALupdate"><code class="code">Sdljoystick.update</code></a>
    yourself and check the state of the joystick when you want joystick
    information.<br>
-<pre><span class="keyword">val</span> <a name="VALset_event_state"></a>set_event_state : <code class="type">bool -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALget_event_state"></a>get_event_state : <code class="type">unit -> bool</code></pre><pre><span class="keyword">type</span> <a name="TYPEhat_value"></a><code class="type"></code>hat_value = <code class="type">int</code> </pre>
+<pre><span id="VALset_event_state"><span class="keyword">val</span> set_event_state</span> : <code class="type">bool -> unit</code></pre><pre><span id="VALget_event_state"><span class="keyword">val</span> get_event_state</span> : <code class="type">unit -> bool</code></pre><pre><span id="TYPEhat_value"><span class="keyword">type</span> <code class="type"></code>hat_value</span> = <code class="type">int</code> </pre>
 
-<pre><span class="keyword">val</span> <a name="VALhat_centered"></a>hat_centered : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_up"></a>hat_up : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_right"></a>hat_right : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_down"></a>hat_down : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_left"></a>hat_left : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_rightup"></a>hat_rightup : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_rightdown"></a>hat_rightdown : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_leftup"></a>hat_leftup : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALhat_leftdown"></a>hat_leftdown : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALget_axis"></a>get_axis : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> int</code></pre><pre><span class="keyword">val</span> <a name="VALget_hat"></a>get_hat : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> <a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span class="keyword">val</span> <a name="VALget_ball"></a>get_ball : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> int * int</code></pre><pre><span class="keyword">val</span> <a name="VALget_button"></a>get_button : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALclose"></a>close : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> unit</code></pre><div class="info">
+<pre><span id="VALhat_centered"><span class="keyword">val</span> hat_centered</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_up"><span class="keyword">val</span> hat_up</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_right"><span class="keyword">val</span> hat_right</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_down"><span class="keyword">val</span> hat_down</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_left"><span class="keyword">val</span> hat_left</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_rightup"><span class="keyword">val</span> hat_rightup</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_rightdown"><span class="keyword">val</span> hat_rightdown</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_leftup"><span class="keyword">val</span> hat_leftup</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALhat_leftdown"><span class="keyword">val</span> hat_leftdown</span> : <code class="type"><a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALget_axis"><span class="keyword">val</span> get_axis</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> int</code></pre><pre><span id="VALget_hat"><span class="keyword">val</span> get_hat</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> <a href="Sdljoystick.html#TYPEhat_value">hat_value</a></code></pre><pre><span id="VALget_ball"><span class="keyword">val</span> get_ball</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> int * int</code></pre><pre><span id="VALget_button"><span class="keyword">val</span> get_button</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> int -> bool</code></pre><pre><span id="VALclose"><span class="keyword">val</span> close</span> : <code class="type"><a href="Sdljoystick.html#TYPEt">t</a> -> unit</code></pre><div class="info">
 Close a joystick previously opened with <a href="Sdljoystick.html#VALopen_joystick"><code class="code">Sdljoystick.open_joystick</code></a><br>
 </div>
 </body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlkey.html ocamlsdl-0.9.0/doc/html/Sdlkey.html
--- ocamlsdl-0.8.0/doc/html/Sdlkey.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlkey.html	2012-05-28 17:53:36.000000000 +0000
@@ -26,7 +26,7 @@
 <link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><link title="Keysyms " rel="Section" href="#3_Keysyms">
 <link title="Keyboard handling " rel="Section" href="#3_Keyboardhandling">
 <link title="Key modifiers " rel="Section" href="#3_Keymodifiers">
-<title>OCamlSDL  : Sdlkey</title>
+<title>OCamlSDL 0.9.0 : Sdlkey</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdljoystick.html">Previous</a>
@@ -38,9 +38,8 @@
 <pre><span class="keyword">module</span> Sdlkey: <code class="code">sig</code> <a href="Sdlkey.html">..</a> <code class="code">end</code></pre>Keyboard handling and key symbols<br>
 <hr width="100%">
 <br>
-<a name="3_Keysyms"></a>
-<h3>Keysyms </h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEt"></a><code class="type"></code>t = </code><table class="typetable">
+<span id="3_Keysyms"><h3>Keysyms </h3></span><br>
+<br><code><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -1670,60 +1669,58 @@
 Concrete type describing keyboard keys ("keysym")<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALint_of_key"></a>int_of_key : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> int</code></pre><div class="info">
+<pre><span id="VALint_of_key"><span class="keyword">val</span> int_of_key</span> : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> int</code></pre><div class="info">
 get the SDL keysym of the key<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALkey_of_int"></a>key_of_int : <code class="type">int -> <a href="Sdlkey.html#TYPEt">t</a></code></pre><div class="info">
+<pre><span id="VALkey_of_int"><span class="keyword">val</span> key_of_int</span> : <code class="type">int -> <a href="Sdlkey.html#TYPEt">t</a></code></pre><div class="info">
 get the key corresponding to a SDL keysym<br>
 <b>Raises</b> <code>Invalid_arg</code> if not a valid SDL keysym<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALchar_of_key"></a>char_of_key : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> char</code></pre><div class="info">
+<pre><span id="VALchar_of_key"><span class="keyword">val</span> char_of_key</span> : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> char</code></pre><div class="info">
 Returns a (iso-8859-1) character corresponding to a key<br>
 <b>Raises</b> <code>Invalid_arg</code> if corresponding SDL keysym is &gt; 255<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_keys"></a>num_keys : <code class="type">int</code></pre><div class="info">
+<pre><span id="VALnum_keys"><span class="keyword">val</span> num_keys</span> : <code class="type">int</code></pre><div class="info">
 number of keys in the Sdlkey.t variant type : should be <code class="code">232</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALmax_code"></a>max_code : <code class="type">int</code></pre><div class="info">
+<pre><span id="VALmax_code"><span class="keyword">val</span> max_code</span> : <code class="type">int</code></pre><div class="info">
 highest SDL keysym : should be <code class="code">322</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALname"></a>name : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> string</code></pre><div class="info">
+<pre><span id="VALname"><span class="keyword">val</span> name</span> : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> string</code></pre><div class="info">
 <b>Returns</b> a short string describing the key<br>
 </div>
 <br>
-<a name="3_Keyboardhandling"></a>
-<h3>Keyboard handling </h3><br>
-<pre><span class="keyword">val</span> <a name="VALenable_unicode"></a>enable_unicode : <code class="type">bool -> unit</code></pre><div class="info">
+<span id="3_Keyboardhandling"><h3>Keyboard handling </h3></span><br>
+<pre><span id="VALenable_unicode"><span class="keyword">val</span> enable_unicode</span> : <code class="type">bool -> unit</code></pre><div class="info">
 Enable unicode translation of keysyms for keyboard events<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALquery_unicode"></a>query_unicode : <code class="type">unit -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALdisable_key_repeat"></a>disable_key_repeat : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALquery_unicode"><span class="keyword">val</span> query_unicode</span> : <code class="type">unit -> bool</code></pre><pre><span id="VALdisable_key_repeat"><span class="keyword">val</span> disable_key_repeat</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Disable keyboard repeat<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALenable_key_repeat"></a>enable_key_repeat : <code class="type">?delay:int -> ?interval:int -> unit -> unit</code></pre><div class="info">
+<pre><span id="VALenable_key_repeat"><span class="keyword">val</span> enable_key_repeat</span> : <code class="type">?delay:int -> ?interval:int -> unit -> unit</code></pre><div class="info">
 Enable keyboard repeat<br>
 </div>
 <div class="param_info"><code class="code">delay</code> : initial delay in ms between the time when a key is
    pressed, and keyboard repeat begins</div>
 <div class="param_info"><code class="code">interval</code> : the time in ms between keyboard repeat events</div>
-<pre><span class="keyword">val</span> <a name="VALget_key_state"></a>get_key_state : <code class="type">unit -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><div class="info">
+<pre><span id="VALget_key_state"><span class="keyword">val</span> get_key_state</span> : <code class="type">unit -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><div class="info">
 Get a snapshot of the current state of the keyboard.<br>
 <b>Returns</b> an array of keystates, indexed by the SDL keysyms 
    (cf <a href="Sdlkey.html#VALint_of_key"><code class="code">Sdlkey.int_of_key</code></a>)<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALis_key_pressed"></a>is_key_pressed : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> bool</code></pre><div class="info">
+<pre><span id="VALis_key_pressed"><span class="keyword">val</span> is_key_pressed</span> : <code class="type"><a href="Sdlkey.html#TYPEt">t</a> -> bool</code></pre><div class="info">
 Checks wether a key is currently pressed on the keyboard.<br>
 </div>
 <br>
-<a name="3_Keymodifiers"></a>
-<h3>Key modifiers </h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEmod_state"></a><code class="type"></code>mod_state = <code class="type">int</code> </pre>
+<span id="3_Keymodifiers"><h3>Key modifiers </h3></span><br>
+<pre><span id="TYPEmod_state"><span class="keyword">type</span> <code class="type"></code>mod_state</span> = <code class="type">int</code> </pre>
 
 <br>
 The following values are flags. Use with <code class="code">land</code>, <code class="code">lor</code>, etc.<br>
-<pre><span class="keyword">val</span> <a name="VALkmod_none"></a>kmod_none : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_lshift"></a>kmod_lshift : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_rshift"></a>kmod_rshift : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_lctrl"></a>kmod_lctrl : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_rctrl"></a>kmod_rctrl : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_lalt"></a>kmod_lalt : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_ralt"></a>kmod_ralt : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_lmeta"></a>kmod_lmeta : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_rmeta"></a>kmod_rmeta : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_num"></a>kmod_num : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_caps"></a>kmod_caps : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_mode"></a>kmod_mode : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_ctrl"></a>kmod_ctrl : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_shift"></a>kmod_shift : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_alt"></a>kmod_alt : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALkmod_meta"></a>kmod_meta : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span class="keyword">val</span> <a name="VALget_mod_state"></a>get_mod_state : <code class="type">unit -> <a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><div class="info">
+<pre><span id="VALkmod_none"><span class="keyword">val</span> kmod_none</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_lshift"><span class="keyword">val</span> kmod_lshift</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_rshift"><span class="keyword">val</span> kmod_rshift</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_lctrl"><span class="keyword">val</span> kmod_lctrl</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_rctrl"><span class="keyword">val</span> kmod_rctrl</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_lalt"><span class="keyword">val</span> kmod_lalt</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_ralt"><span class="keyword">val</span> kmod_ralt</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_lmeta"><span class="keyword">val</span> kmod_lmeta</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_rmeta"><span class="keyword">val</span> kmod_rmeta</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_num"><span class="keyword">val</span> kmod_num</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_caps"><span class="keyword">val</span> kmod_caps</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_mode"><span class="keyword">val</span> kmod_mode</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_ctrl"><span class="keyword">val</span> kmod_ctrl</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_shift"><span class="keyword">val</span> kmod_shift</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_alt"><span class="keyword">val</span> kmod_alt</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALkmod_meta"><span class="keyword">val</span> kmod_meta</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><pre><span id="VALget_mod_state"><span class="keyword">val</span> get_mod_state</span> : <code class="type">unit -> <a href="Sdlkey.html#TYPEmod_state">mod_state</a></code></pre><div class="info">
 Get the current key modifier state<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_mod_state"></a>set_mod_state : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a> -> unit</code></pre><div class="info">
+<pre><span id="VALset_mod_state"><span class="keyword">val</span> set_mod_state</span> : <code class="type"><a href="Sdlkey.html#TYPEmod_state">mod_state</a> -> unit</code></pre><div class="info">
 Set the current key modifier state
    This does not change the keyboard state, only the key modifier flags.<br>
 </div>
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlloader.html ocamlsdl-0.9.0/doc/html/Sdlloader.html
--- ocamlsdl-0.8.0/doc/html/Sdlloader.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlloader.html	2012-05-28 17:53:37.000000000 +0000
@@ -23,7 +23,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlloader</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlloader</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlttf.html">Previous</a>
@@ -34,14 +34,14 @@
 <br>
 <pre><span class="keyword">module</span> Sdlloader: <code class="code">sig</code> <a href="Sdlloader.html">..</a> <code class="code">end</code></pre>Image loader module<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDLloader_exception"></a>SDLloader_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDLloader_exception"><span class="keyword">exception</span> SDLloader_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 Exception to report errors<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALload_image"></a>load_image : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><div class="info">
+<pre><span id="VALload_image"><span class="keyword">val</span> load_image</span> : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><div class="info">
 load an image as a surface<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALload_image_from_mem"></a>load_image_from_mem : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALread_XPM_from_array"></a>read_XPM_from_array : <code class="type">string array -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><div class="info">
+<pre><span id="VALload_image_from_mem"><span class="keyword">val</span> load_image_from_mem</span> : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALread_XPM_from_array"><span class="keyword">val</span> read_XPM_from_array</span> : <code class="type">string array -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><div class="info">
 creates a surface from an array of strings 
        (in the source code)<br>
 </div>
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlmixer.html ocamlsdl-0.9.0/doc/html/Sdlmixer.html
--- ocamlsdl-0.8.0/doc/html/Sdlmixer.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlmixer.html	2012-05-28 17:53:37.000000000 +0000
@@ -28,7 +28,7 @@
 <link title="Channels" rel="Section" href="#3_Channels">
 <link title="Groups" rel="Section" href="#3_Groups">
 <link title="Music" rel="Section" href="#3_Music">
-<title>OCamlSDL  : Sdlmixer</title>
+<title>OCamlSDL 0.9.0 : Sdlmixer</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlloader.html">Previous</a>
@@ -39,17 +39,16 @@
 <br>
 <pre><span class="keyword">module</span> Sdlmixer: <code class="code">sig</code> <a href="Sdlmixer.html">..</a> <code class="code">end</code></pre>Simple multi-channel audio mixer<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDLmixer_exception"></a>SDLmixer_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDLmixer_exception"><span class="keyword">exception</span> SDLmixer_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 Exception used to report errors<br>
 </div>
 <br>
-<a name="3_GeneralAPI"></a>
-<h3>General API</h3><br>
-<pre><span class="keyword">val</span> <a name="VALversion"></a>version : <code class="type">unit -> <a href="Sdl.html#TYPEversion">Sdl.version</a></code></pre><div class="info">
+<span id="3_GeneralAPI"><h3>General API</h3></span><br>
+<pre><span id="VALversion"><span class="keyword">val</span> version</span> : <code class="type">unit -> <a href="Sdl.html#TYPEversion">Sdl.version</a></code></pre><div class="info">
 Get the version of the dynamically linked SDL_mixer library<br>
 </div>
-<br><code><span class="keyword">type</span> <a name="TYPEformat"></a><code class="type"></code>format = </code><table class="typetable">
+<br><code><span id="TYPEformat"><span class="keyword">type</span> <code class="type"></code>format</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -111,7 +110,7 @@
 Audio format flags<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEchannels"></a><code class="type"></code>channels = </code><table class="typetable">
+<br><code><span id="TYPEchannels"><span class="keyword">type</span> <code class="type"></code>channels</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -128,7 +127,7 @@
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALopen_audio"></a>open_audio : <code class="type">?freq:int -><br>       ?format:<a href="Sdlmixer.html#TYPEformat">format</a> -><br>       ?chunksize:int -> ?channels:<a href="Sdlmixer.html#TYPEchannels">channels</a> -> unit -> unit</code></pre><div class="info">
+<pre><span id="VALopen_audio"><span class="keyword">val</span> open_audio</span> : <code class="type">?freq:int -><br>       ?format:<a href="Sdlmixer.html#TYPEformat">format</a> -><br>       ?chunksize:int -> ?channels:<a href="Sdlmixer.html#TYPEchannels">channels</a> -> unit -> unit</code></pre><div class="info">
 <code class="code">open_audio frequency format chunksize channels ()</code> opens the mixer
     with a certain audio format.  <ul>
 <li>frequency could be 8000 11025 22050 44100 ; defaults to 22050</li>
@@ -138,10 +137,10 @@
 </ul>
 <br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALclose_audio"></a>close_audio : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALclose_audio"><span class="keyword">val</span> close_audio</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Close the mixer, halting all playing audio<br>
 </div>
-<br><code><span class="keyword">type</span> <a name="TYPEspecs"></a><code class="type"></code>specs = {</code><table class="typetable">
+<br><code><span id="TYPEspecs"><span class="keyword">type</span> <code class="type"></code>specs</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -166,42 +165,43 @@
 }
 
 
-<pre><span class="keyword">val</span> <a name="VALquery_specs"></a>query_specs : <code class="type">unit -> <a href="Sdlmixer.html#TYPEspecs">specs</a></code></pre><div class="info">
+<pre><span id="VALquery_specs"><span class="keyword">val</span> query_specs</span> : <code class="type">unit -> <a href="Sdlmixer.html#TYPEspecs">specs</a></code></pre><div class="info">
 Find out what the actual audio device parameters are.<br>
 <b>Raises</b> <code>SDLmixer_exception</code> if the audio has not been opened<br>
 </div>
 <br>
-<a name="3_Samples"></a>
-<h3>Samples</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEchunk"></a><code class="type"></code>chunk </pre>
+<span id="3_Samples"><h3>Samples</h3></span><br>
+<pre><span id="TYPEchunk"><span class="keyword">type</span> <code class="type"></code>chunk</span> </pre>
 
-<pre><span class="keyword">val</span> <a name="VALloadWAV"></a>loadWAV : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><div class="info">
+<pre><span id="VALloadWAV"><span class="keyword">val</span> loadWAV</span> : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><div class="info">
 Load a wave file<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALloadWAV_from_mem"></a>loadWAV_from_mem : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><pre><span class="keyword">val</span> <a name="VALload_string"></a>load_string : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><div class="info">
+<pre><span id="VALloadWAV_from_mem"><span class="keyword">val</span> loadWAV_from_mem</span> : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><pre><span id="VALload_string"><span class="keyword">val</span> load_string</span> : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><div class="info">
 Load a wave file of the mixer format from a memory buffer<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALvolume_chunk"></a>volume_chunk : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float</code></pre><pre><span class="keyword">val</span> <a name="VALsetvolume_chunk"></a>setvolume_chunk : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALfree_chunk"></a>free_chunk : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
+<pre><span id="VALload_string_raw"><span class="keyword">val</span> load_string_raw</span> : <code class="type">string -> <a href="Sdlmixer.html#TYPEchunk">chunk</a></code></pre><div class="info">
+Load raw audio data of the mixer format from a memory buffer<br>
+</div>
+<pre><span id="VALvolume_chunk"><span class="keyword">val</span> volume_chunk</span> : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float</code></pre><pre><span id="VALsetvolume_chunk"><span class="keyword">val</span> setvolume_chunk</span> : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float -> unit</code></pre><pre><span id="VALfree_chunk"><span class="keyword">val</span> free_chunk</span> : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
 Free an audio chunk previously loaded<br>
 </div>
 <br>
-<a name="3_Channels"></a>
-<h3>Channels</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEchannel"></a><code class="type"></code>channel = <code class="type">int</code> </pre>
+<span id="3_Channels"><h3>Channels</h3></span><br>
+<pre><span id="TYPEchannel"><span class="keyword">type</span> <code class="type"></code>channel</span> = <code class="type">int</code> </pre>
 
-<pre><span class="keyword">val</span> <a name="VALall_channels"></a>all_channels : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
+<pre><span id="VALall_channels"><span class="keyword">val</span> all_channels</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
 A special value for representing all channels (-1 actually).<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALnum_channels"></a>num_channels : <code class="type">unit -> int</code></pre><div class="info">
+<pre><span id="VALnum_channels"><span class="keyword">val</span> num_channels</span> : <code class="type">unit -> int</code></pre><div class="info">
 <b>Returns</b> the number of channels currently allocated<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALallocate_channels"></a>allocate_channels : <code class="type">int -> int</code></pre><div class="info">
+<pre><span id="VALallocate_channels"><span class="keyword">val</span> allocate_channels</span> : <code class="type">int -> int</code></pre><div class="info">
 Dynamically change the number of channels managed by the mixer.
     If decreasing the number of channels, the upper channels are
     stopped.<br>
 <b>Returns</b> the new number of allocated channels<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALplay_channel"></a>play_channel : <code class="type">?channel:<a href="Sdlmixer.html#TYPEchannel">channel</a> -><br>       ?loops:int -> ?ticks:float -> <a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
+<pre><span id="VALplay_channel"><span class="keyword">val</span> play_channel</span> : <code class="type">?channel:<a href="Sdlmixer.html#TYPEchannel">channel</a> -><br>       ?loops:int -> ?ticks:float -> <a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
 <code class="code">play_channel channel loops ticks chunk </code> Play an audio chunk.<br>
 </div>
 <div class="param_info"><code class="code">channel</code> : channel to play on. If not specified, play on the
@@ -209,37 +209,37 @@
 <div class="param_info"><code class="code">loops</code> : number of times to play the chunk. If <code class="code">-1</code>, loop
   infinitely (~65000 times).</div>
 <div class="param_info"><code class="code">ticks</code> : if specified, play for at most 'ticks' seconds.</div>
-<pre><span class="keyword">val</span> <a name="VALplay_sound"></a>play_sound : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
+<pre><span id="VALplay_sound"><span class="keyword">val</span> play_sound</span> : <code class="type"><a href="Sdlmixer.html#TYPEchunk">chunk</a> -> unit</code></pre><div class="info">
 Play an audio chunk. Same as above, without the optional
   parameters<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfadein_channel"></a>fadein_channel : <code class="type">?channel:<a href="Sdlmixer.html#TYPEchannel">channel</a> -><br>       ?loops:int -> ?ticks:float -> <a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float -> unit</code></pre><div class="info">
+<pre><span id="VALfadein_channel"><span class="keyword">val</span> fadein_channel</span> : <code class="type">?channel:<a href="Sdlmixer.html#TYPEchannel">channel</a> -><br>       ?loops:int -> ?ticks:float -> <a href="Sdlmixer.html#TYPEchunk">chunk</a> -> float -> unit</code></pre><div class="info">
 <code class="code">fadein_channel channel loops ticks chunck ms</code> :
    same as <code class="code">play_channel</code> but fades in a over <code class="code">ms</code> seconds.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALvolume_channel"></a>volume_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float</code></pre><div class="info">
+<pre><span id="VALvolume_channel"><span class="keyword">val</span> volume_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float</code></pre><div class="info">
 Returns the original volume of a specific channel, chunk or music<br>
 <b>Returns</b> float between 0 and 1.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsetvolume_channel"></a>setvolume_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float -> unit</code></pre><div class="info">
+<pre><span id="VALsetvolume_channel"><span class="keyword">val</span> setvolume_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float -> unit</code></pre><div class="info">
 Sets the volume for specified channel or chunk. 
    Volume is a float between 0 and 1. 
    If lower than 0, nothing is done.
    If greater than 1, volume is set to 1<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALpause_channel"></a>pause_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALresume_channel"></a>resume_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALhalt_channel"></a>halt_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALexpire_channel"></a>expire_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float option -> unit</code></pre><div class="info">
+<pre><span id="VALpause_channel"><span class="keyword">val</span> pause_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span id="VALresume_channel"><span class="keyword">val</span> resume_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span id="VALhalt_channel"><span class="keyword">val</span> halt_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> unit</code></pre><pre><span id="VALexpire_channel"><span class="keyword">val</span> expire_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float option -> unit</code></pre><div class="info">
 <code class="code">expire_channel channel ticks</code>
   Change the expiration delay for a particular channel.
   The sample will stop playing after the 'ticks' seconds have elapsed,
   or remove the expiration if 'ticks' is <code class="code">None</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfadeout_channel"></a>fadeout_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float -> unit</code></pre><div class="info">
+<pre><span id="VALfadeout_channel"><span class="keyword">val</span> fadeout_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> float -> unit</code></pre><div class="info">
 <code class="code">fadeout_channel channel ticks</code>
   Halt a channel, fading it out progressively till it's silent
   The ms parameter indicates the number of seconds the fading
   will take.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALplaying_channel"></a>playing_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALnum_playing_channel"></a>num_playing_channel : <code class="type">unit -> int</code></pre><pre><span class="keyword">val</span> <a name="VALpaused_channel"></a>paused_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALnum_paused_channel"></a>num_paused_channel : <code class="type">unit -> int</code></pre><br><code><span class="keyword">type</span> <a name="TYPEfade_status"></a><code class="type"></code>fade_status = </code><table class="typetable">
+<pre><span id="VALplaying_channel"><span class="keyword">val</span> playing_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> bool</code></pre><pre><span id="VALnum_playing_channel"><span class="keyword">val</span> num_playing_channel</span> : <code class="type">unit -> int</code></pre><pre><span id="VALpaused_channel"><span class="keyword">val</span> paused_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> bool</code></pre><pre><span id="VALnum_paused_channel"><span class="keyword">val</span> num_paused_channel</span> : <code class="type">unit -> int</code></pre><br><code><span id="TYPEfade_status"><span class="keyword">type</span> <code class="type"></code>fade_status</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -266,60 +266,58 @@
 The different fading types supported<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALfading_channel"></a>fading_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEfade_status">fade_status</a></code></pre><div class="info">
+<pre><span id="VALfading_channel"><span class="keyword">val</span> fading_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEfade_status">fade_status</a></code></pre><div class="info">
 Query the fading status of a channel<br>
 </div>
 <br>
-<a name="3_Groups"></a>
-<h3>Groups</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEgroup"></a><code class="type"></code>group = <code class="type">int</code> </pre>
+<span id="3_Groups"><h3>Groups</h3></span><br>
+<pre><span id="TYPEgroup"><span class="keyword">type</span> <code class="type"></code>group</span> = <code class="type">int</code> </pre>
 
-<pre><span class="keyword">val</span> <a name="VALdefault_group"></a>default_group : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a></code></pre><div class="info">
+<pre><span id="VALdefault_group"><span class="keyword">val</span> default_group</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a></code></pre><div class="info">
 The group tag used to represent the group of all the channels.
    Used to remove a group tag<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALreserve_channels"></a>reserve_channels : <code class="type">int -> int</code></pre><div class="info">
+<pre><span id="VALreserve_channels"><span class="keyword">val</span> reserve_channels</span> : <code class="type">int -> int</code></pre><div class="info">
 Reserve the first channels (0 -&gt; n-1) for the application,
     i.e. don't allocate them dynamically to the next sample if
     no channel is specified (see <a href="Sdlmixer.html#VALplay_channel"><code class="code">Sdlmixer.play_channel</code></a>).<br>
 <b>Returns</b> the number of reserved channels<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_channel"></a>group_channel : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><div class="info">
+<pre><span id="VALgroup_channel"><span class="keyword">val</span> group_channel</span> : <code class="type"><a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><div class="info">
 Attach a group tag to a channel. A group tag can be assigned to several
    mixer channels, to form groups of channels.  
    If group is <code class="code">default_group</code>, the tag is removed.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_channels"></a>group_channels : <code class="type">from_c:<a href="Sdlmixer.html#TYPEchannel">channel</a> -> to_c:<a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><div class="info">
+<pre><span id="VALgroup_channels"><span class="keyword">val</span> group_channels</span> : <code class="type">from_c:<a href="Sdlmixer.html#TYPEchannel">channel</a> -> to_c:<a href="Sdlmixer.html#TYPEchannel">channel</a> -> <a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><div class="info">
 Same as above but for a range of channels.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_count"></a>group_count : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> int</code></pre><div class="info">
+<pre><span id="VALgroup_count"><span class="keyword">val</span> group_count</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> int</code></pre><div class="info">
 Returns the number of channels in a group. 
    This is also a subtle way to get the total number of channels 
    when <code class="code">group</code> is <code class="code">default_group</code>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_available"></a>group_available : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
+<pre><span id="VALgroup_available"><span class="keyword">val</span> group_available</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
 Finds the first available <code class="code">channel</code> in a <code class="code">group</code> of channels<br>
 <b>Raises</b> <code>Not_found</code> if none are available.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_oldest"></a>group_oldest : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
+<pre><span id="VALgroup_oldest"><span class="keyword">val</span> group_oldest</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
 Finds the "oldest" sample playing in a <code class="code">group</code> of channels<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgroup_newer"></a>group_newer : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
+<pre><span id="VALgroup_newer"><span class="keyword">val</span> group_newer</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> <a href="Sdlmixer.html#TYPEchannel">channel</a></code></pre><div class="info">
 Finds the "most recent" (i.e. last) sample playing in a <code class="code">group</code> of
    channels<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfadeout_group"></a>fadeout_group : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> float -> unit</code></pre><div class="info">
+<pre><span id="VALfadeout_group"><span class="keyword">val</span> fadeout_group</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> float -> unit</code></pre><div class="info">
 <code class="code">fadeout_group group ticks</code>
   Halt a group of channel, fading it out progressively till it's silent
   The ms parameter indicates the number of seconds the fading
   will take.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALhalt_group"></a>halt_group : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><br>
-<a name="3_Music"></a>
-<h3>Music</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEmusic"></a><code class="type"></code>music </pre>
+<pre><span id="VALhalt_group"><span class="keyword">val</span> halt_group</span> : <code class="type"><a href="Sdlmixer.html#TYPEgroup">group</a> -> unit</code></pre><br>
+<span id="3_Music"><h3>Music</h3></span><br>
+<pre><span id="TYPEmusic"><span class="keyword">type</span> <code class="type"></code>music</span> </pre>
 
-<br><code><span class="keyword">type</span> <a name="TYPEmusic_kind"></a><code class="type"></code>music_kind = </code><table class="typetable">
+<br><code><span id="TYPEmusic_kind"><span class="keyword">type</span> <code class="type"></code>music_kind</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -374,39 +372,39 @@
 The different music types supported<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALload_music"></a>load_music : <code class="type">string -> <a href="Sdlmixer.html#TYPEmusic">music</a></code></pre><div class="info">
+<pre><span id="VALload_music"><span class="keyword">val</span> load_music</span> : <code class="type">string -> <a href="Sdlmixer.html#TYPEmusic">music</a></code></pre><div class="info">
 Load a music file (.mod .s3m .it .xm .ogg)<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfree_music"></a>free_music : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> unit</code></pre><div class="info">
+<pre><span id="VALfree_music"><span class="keyword">val</span> free_music</span> : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> unit</code></pre><div class="info">
 Free music previously loaded<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALplay_music"></a>play_music : <code class="type">?loops:int -> <a href="Sdlmixer.html#TYPEmusic">music</a> -> unit</code></pre><div class="info">
+<pre><span id="VALplay_music"><span class="keyword">val</span> play_music</span> : <code class="type">?loops:int -> <a href="Sdlmixer.html#TYPEmusic">music</a> -> unit</code></pre><div class="info">
 Play a music chunk.<br>
 </div>
 <div class="param_info"><code class="code">loops</code> : number of times to play through the music</div>
-<pre><span class="keyword">val</span> <a name="VALfadein_music"></a>fadein_music : <code class="type">?loops:int -> <a href="Sdlmixer.html#TYPEmusic">music</a> -> float -> unit</code></pre><div class="info">
+<pre><span id="VALfadein_music"><span class="keyword">val</span> fadein_music</span> : <code class="type">?loops:int -> <a href="Sdlmixer.html#TYPEmusic">music</a> -> float -> unit</code></pre><div class="info">
 <code class="code">fadein_music chunck loops music ms</code> :
    fade in music over <code class="code">ms</code> seconds, same semantics as the <code class="code">play_music</code>
    function<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALvolume_music"></a>volume_music : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> float</code></pre><pre><span class="keyword">val</span> <a name="VALsetvolume_music"></a>setvolume_music : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> float -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALpause_music"></a>pause_music : <code class="type">unit -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALresume_music"></a>resume_music : <code class="type">unit -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALrewind_music"></a>rewind_music : <code class="type">unit -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_music_cmd"></a>set_music_cmd : <code class="type">string -> unit</code></pre><div class="info">
+<pre><span id="VALvolume_music"><span class="keyword">val</span> volume_music</span> : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> float</code></pre><pre><span id="VALsetvolume_music"><span class="keyword">val</span> setvolume_music</span> : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> -> float -> unit</code></pre><pre><span id="VALpause_music"><span class="keyword">val</span> pause_music</span> : <code class="type">unit -> unit</code></pre><pre><span id="VALresume_music"><span class="keyword">val</span> resume_music</span> : <code class="type">unit -> unit</code></pre><pre><span id="VALrewind_music"><span class="keyword">val</span> rewind_music</span> : <code class="type">unit -> unit</code></pre><pre><span id="VALset_music_cmd"><span class="keyword">val</span> set_music_cmd</span> : <code class="type">string -> unit</code></pre><div class="info">
 Stop music and set external music playback command<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALunset_music_cmd"></a>unset_music_cmd : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALunset_music_cmd"><span class="keyword">val</span> unset_music_cmd</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Turn off using an external command for music, returning to the
     internal music playing functionality<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALhalt_music"></a>halt_music : <code class="type">unit -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALfadeout_music"></a>fadeout_music : <code class="type">float -> unit</code></pre><div class="info">
+<pre><span id="VALhalt_music"><span class="keyword">val</span> halt_music</span> : <code class="type">unit -> unit</code></pre><pre><span id="VALfadeout_music"><span class="keyword">val</span> fadeout_music</span> : <code class="type">float -> unit</code></pre><div class="info">
 <code class="code">fadeout_music ticks</code>
   Halt the music, fading it out progressively till it's silent.
   The ms parameter indicates the number of seconds the fading
   will take.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALmusic_type"></a>music_type : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> option -> <a href="Sdlmixer.html#TYPEmusic_kind">music_kind</a></code></pre><div class="info">
+<pre><span id="VALmusic_type"><span class="keyword">val</span> music_type</span> : <code class="type"><a href="Sdlmixer.html#TYPEmusic">music</a> option -> <a href="Sdlmixer.html#TYPEmusic_kind">music_kind</a></code></pre><div class="info">
 Find out the music format of a mixer music, or the currently
     playing music, if parameter is <code class="code">None</code>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALplaying_music"></a>playing_music : <code class="type">unit -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALpaused_music"></a>paused_music : <code class="type">unit -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfading_music"></a>fading_music : <code class="type">unit -> <a href="Sdlmixer.html#TYPEfade_status">fade_status</a></code></pre><div class="info">
+<pre><span id="VALplaying_music"><span class="keyword">val</span> playing_music</span> : <code class="type">unit -> bool</code></pre><pre><span id="VALpaused_music"><span class="keyword">val</span> paused_music</span> : <code class="type">unit -> bool</code></pre><pre><span id="VALfading_music"><span class="keyword">val</span> fading_music</span> : <code class="type">unit -> <a href="Sdlmixer.html#TYPEfade_status">fade_status</a></code></pre><div class="info">
 Query the fading status of a music<br>
 </div>
 </body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlmouse.html ocamlsdl-0.9.0/doc/html/Sdlmouse.html
--- ocamlsdl-0.8.0/doc/html/Sdlmouse.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlmouse.html	2012-05-28 17:53:36.000000000 +0000
@@ -25,7 +25,7 @@
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
 <link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><link title="Mouse state" rel="Section" href="#3_Mousestate">
 <link title="Cursors " rel="Section" href="#3_Cursors">
-<title>OCamlSDL  : Sdlmouse</title>
+<title>OCamlSDL 0.9.0 : Sdlmouse</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlkey.html">Previous</a>
@@ -37,9 +37,8 @@
 <pre><span class="keyword">module</span> Sdlmouse: <code class="code">sig</code> <a href="Sdlmouse.html">..</a> <code class="code">end</code></pre>Mouse event handling and cursors<br>
 <hr width="100%">
 <br>
-<a name="3_Mousestate"></a>
-<h3>Mouse state</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEbutton"></a><code class="type"></code>button = </code><table class="typetable">
+<span id="3_Mousestate"><h3>Mouse state</h3></span><br>
+<br><code><span id="TYPEbutton"><span class="keyword">type</span> <code class="type"></code>button</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -74,26 +73,33 @@
 <td align="left" valign="top" >
 <code><span class="constructor">BUTTON_WHEELDOWN</span></code></td>
 
+</tr>
+<tr>
+<td align="left" valign="top" >
+<code><span class="keyword">|</span></code></td>
+<td align="left" valign="top" >
+<code><span class="constructor">BUTTON_X</span> <span class="keyword">of</span> <code class="type">int</code></code></td>
+<td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >BUTTON_X is only seen in a Sdlevent.mousebutton_event,
+                        it is not returned by Sdlmouse.get_state</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td>
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALget_state"></a>get_state : <code class="type">?relative:bool -> unit -> int * int * <a href="Sdlmouse.html#TYPEbutton">button</a> list</code></pre><div class="info">
+<pre><span id="VALget_state"><span class="keyword">val</span> get_state</span> : <code class="type">?relative:bool -> unit -> int * int * <a href="Sdlmouse.html#TYPEbutton">button</a> list</code></pre><div class="info">
 Retrieve the current state of the mouse : 
    current mouse position and list of pressed buttons<br>
 </div>
 <div class="param_info"><code class="code">relative</code> : if true returns mouse delta instead of position</div>
-<pre><span class="keyword">val</span> <a name="VALwarp"></a>warp : <code class="type">int -> int -> unit</code></pre><div class="info">
+<pre><span id="VALwarp"><span class="keyword">val</span> warp</span> : <code class="type">int -> int -> unit</code></pre><div class="info">
 Set the position of the mouse cursor (generates a mouse motion event)<br>
 </div>
 <br>
-<a name="3_Cursors"></a>
-<h3>Cursors </h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEcursor"></a><code class="type"></code>cursor </pre>
+<span id="3_Cursors"><h3>Cursors </h3></span><br>
+<pre><span id="TYPEcursor"><span class="keyword">type</span> <code class="type"></code>cursor</span> </pre>
 <div class="info">
 abstract type for cursors<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEcursor_data"></a><code class="type"></code>cursor_data = {</code><table class="typetable">
+<br><code><span id="TYPEcursor_data"><span class="keyword">type</span> <code class="type"></code>cursor_data</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -139,7 +145,7 @@
 }
 
 
-<pre><span class="keyword">val</span> <a name="VALmake_cursor"></a>make_cursor : <code class="type">data:(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array2.t -><br>       mask:(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array2.t -><br>       hot_x:int -> hot_y:int -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre><div class="info">
+<pre><span id="VALmake_cursor"><span class="keyword">val</span> make_cursor</span> : <code class="type">data:(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array2.t -><br>       mask:(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array2.t -><br>       hot_x:int -> hot_y:int -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre><div class="info">
 Create a cursor using the specified data and mask (in MSB format).
 <p>
 
@@ -154,27 +160,27 @@
    Cursors created with this function must be freed 
    with <a href="Sdlmouse.html#VALfree_cursor"><code class="code">Sdlmouse.free_cursor</code></a>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfree_cursor"></a>free_cursor : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
+<pre><span id="VALfree_cursor"><span class="keyword">val</span> free_cursor</span> : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
 Deallocates a cursor.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_cursor"></a>set_cursor : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
+<pre><span id="VALset_cursor"><span class="keyword">val</span> set_cursor</span> : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
 Set the currently active cursor to the specified one.
    If the cursor is currently visible, the change will be immediately 
    represented on the display.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_cursor"></a>get_cursor : <code class="type">unit -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre><div class="info">
+<pre><span id="VALget_cursor"><span class="keyword">val</span> get_cursor</span> : <code class="type">unit -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre><div class="info">
 Returns the currently active cursor.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcursor_visible"></a>cursor_visible : <code class="type">unit -> bool</code></pre><div class="info">
+<pre><span id="VALcursor_visible"><span class="keyword">val</span> cursor_visible</span> : <code class="type">unit -> bool</code></pre><div class="info">
 Tests if cursor is shown on screen<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALshow_cursor"></a>show_cursor : <code class="type">bool -> unit</code></pre><div class="info">
+<pre><span id="VALshow_cursor"><span class="keyword">val</span> show_cursor</span> : <code class="type">bool -> unit</code></pre><div class="info">
 Toggle cursor display<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcursor_data"></a>cursor_data : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> <a href="Sdlmouse.html#TYPEcursor_data">cursor_data</a></code></pre><div class="info">
+<pre><span id="VALcursor_data"><span class="keyword">val</span> cursor_data</span> : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> <a href="Sdlmouse.html#TYPEcursor_data">cursor_data</a></code></pre><div class="info">
 converts an abstract cursor value to concrete cursor data<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALpprint_cursor"></a>pprint_cursor : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
+<pre><span id="VALpprint_cursor"><span class="keyword">val</span> pprint_cursor</span> : <code class="type"><a href="Sdlmouse.html#TYPEcursor">cursor</a> -> unit</code></pre><div class="info">
 for debugging : prints on stdout<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALconvert_to_cursor"></a>convert_to_cursor : <code class="type">data:int array -><br>       mask:int array -> w:int -> h:int -> hot_x:int -> hot_y:int -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre></body></html>
\ No newline at end of file
+<pre><span id="VALconvert_to_cursor"><span class="keyword">val</span> convert_to_cursor</span> : <code class="type">data:int array -><br>       mask:int array -> w:int -> h:int -> hot_x:int -> hot_y:int -> <a href="Sdlmouse.html#TYPEcursor">cursor</a></code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdltimer.html ocamlsdl-0.9.0/doc/html/Sdltimer.html
--- ocamlsdl-0.8.0/doc/html/Sdltimer.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdltimer.html	2012-05-28 17:53:36.000000000 +0000
@@ -23,7 +23,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdltimer</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdltimer</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlcdrom.html">Previous</a>
@@ -34,10 +34,10 @@
 <br>
 <pre><span class="keyword">module</span> Sdltimer: <code class="code">sig</code> <a href="Sdltimer.html">..</a> <code class="code">end</code></pre>Time-related functions<br>
 <hr width="100%">
-<pre><span class="keyword">val</span> <a name="VALdelay"></a>delay : <code class="type">int -> unit</code></pre><div class="info">
+<pre><span id="VALdelay"><span class="keyword">val</span> delay</span> : <code class="type">int -> unit</code></pre><div class="info">
 Wait a specified number of milliseconds before returning<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_ticks"></a>get_ticks : <code class="type">unit -> int</code></pre><div class="info">
+<pre><span id="VALget_ticks"><span class="keyword">val</span> get_ticks</span> : <code class="type">unit -> int</code></pre><div class="info">
 Get the number of milliseconds since the SDL library initialization.<br>
 </div>
 </body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlttf.html ocamlsdl-0.9.0/doc/html/Sdlttf.html
--- ocamlsdl-0.8.0/doc/html/Sdlttf.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlttf.html	2012-05-28 17:53:37.000000000 +0000
@@ -28,7 +28,7 @@
 <link title="Text rendering functions" rel="Section" href="#3_Textrenderingfunctions">
 <link title="Text rendering functions" rel="Subsection" href="#4_Textrenderingfunctions">
 <link title="Glyph rendering functions" rel="Subsection" href="#4_Glyphrenderingfunctions">
-<title>OCamlSDL  : Sdlttf</title>
+<title>OCamlSDL 0.9.0 : Sdlttf</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlwm.html">Previous</a>
@@ -39,25 +39,24 @@
 <br>
 <pre><span class="keyword">module</span> Sdlttf: <code class="code">sig</code> <a href="Sdlttf.html">..</a> <code class="code">end</code></pre>This module provides TTF (TrueType Font) support<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONSDLttf_exception"></a>SDLttf_exception <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONSDLttf_exception"><span class="keyword">exception</span> SDLttf_exception</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <div class="info">
 Exception for reporting errors<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALinit"></a>init : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALinit"><span class="keyword">val</span> init</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Initialise SDL_tff and freetype<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALquit"></a>quit : <code class="type">unit -> unit</code></pre><div class="info">
+<pre><span id="VALquit"><span class="keyword">val</span> quit</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Quits the system<br>
 </div>
 <br>
-<a name="3_Generaloperationsonfontdatatype"></a>
-<h3>General operations on font datatype</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEfont"></a><code class="type"></code>font </pre>
+<span id="3_Generaloperationsonfontdatatype"><h3>General operations on font datatype</h3></span><br>
+<pre><span id="TYPEfont"><span class="keyword">type</span> <code class="type"></code>font</span> </pre>
 <div class="info">
 abstract font datatype<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALopen_font"></a>open_font : <code class="type">string -> ?index:int -> int -> <a href="Sdlttf.html#TYPEfont">font</a></code></pre><div class="info">
+<pre><span id="VALopen_font"><span class="keyword">val</span> open_font</span> : <code class="type">string -> ?index:int -> int -> <a href="Sdlttf.html#TYPEfont">font</a></code></pre><div class="info">
 open a font file and create a font of the specified point size<br>
 <b>Returns</b> font datatype<br>
 </div>
@@ -65,7 +64,7 @@
 Set and retrieve the font style
    This font style is implemented by modifying the font glyphs, and
    doesn't reflect any inherent properties of the truetype font file.<br>
-<br><code><span class="keyword">type</span> <a name="TYPEfont_style"></a><code class="type"></code>font_style = </code><table class="typetable">
+<br><code><span id="TYPEfont_style"><span class="keyword">type</span> <code class="type"></code>font_style</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -96,42 +95,40 @@
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALget_font_style"></a>get_font_style : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPEfont_style">font_style</a> list</code></pre><div class="info">
+<pre><span id="VALget_font_style"><span class="keyword">val</span> get_font_style</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPEfont_style">font_style</a> list</code></pre><div class="info">
 Retrieve the font style : either <code class="code">NORMAL</code> or a combination of 
    <code class="code">BOLD</code>, <code class="code">ITALIC</code> and <code class="code">UNDERLINE</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_font_style"></a>set_font_style : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPEfont_style">font_style</a> list -> unit</code></pre><br>
-<a name="3_Fontinformation"></a>
-<h3>Font information </h3><br>
-<pre><span class="keyword">val</span> <a name="VALfont_height"></a>font_height : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
+<pre><span id="VALset_font_style"><span class="keyword">val</span> set_font_style</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPEfont_style">font_style</a> list -> unit</code></pre><br>
+<span id="3_Fontinformation"><h3>Font information </h3></span><br>
+<pre><span id="VALfont_height"><span class="keyword">val</span> font_height</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
 <b>Returns</b> the total height(int) of the font (usually equal to point size)<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfont_ascent"></a>font_ascent : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
+<pre><span id="VALfont_ascent"><span class="keyword">val</span> font_ascent</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
 <b>Returns</b> the offset(int) from the baseline to the top of the font
    this is a positive value, relative to the baseline<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfont_descent"></a>font_descent : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
+<pre><span id="VALfont_descent"><span class="keyword">val</span> font_descent</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
 <b>Returns</b> the offset from the baseline to the bottom of the font
    this is a negative value, relative to the baseline<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfont_lineskip"></a>font_lineskip : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
+<pre><span id="VALfont_lineskip"><span class="keyword">val</span> font_lineskip</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
 Get the recommended spacing between lines of text for this font<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALfont_faces"></a>font_faces : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
+<pre><span id="VALfont_faces"><span class="keyword">val</span> font_faces</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> int</code></pre><div class="info">
 Get the number of faces of the font<br>
 </div>
 <br>
 Get some font face attributes, if any<br>
-<pre><span class="keyword">val</span> <a name="VALis_fixed_width"></a>is_fixed_width : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> bool</code></pre><pre><span class="keyword">val</span> <a name="VALfamily_name"></a>family_name : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string</code></pre><pre><span class="keyword">val</span> <a name="VALstyle_name"></a>style_name : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string</code></pre><br>
-<a name="3_Textrenderingfunctions"></a>
-<h3>Text rendering functions</h3><br>
-<pre><span class="keyword">val</span> <a name="VALsize_text"></a>size_text : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> int * int</code></pre><div class="info">
+<pre><span id="VALis_fixed_width"><span class="keyword">val</span> is_fixed_width</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> bool</code></pre><pre><span id="VALfamily_name"><span class="keyword">val</span> family_name</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string</code></pre><pre><span id="VALstyle_name"><span class="keyword">val</span> style_name</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string</code></pre><br>
+<span id="3_Textrenderingfunctions"><h3>Text rendering functions</h3></span><br>
+<pre><span id="VALsize_text"><span class="keyword">val</span> size_text</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> int * int</code></pre><div class="info">
 Get the dimensions of a rendered string of text<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsize_utf8"></a>size_utf8 : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> int * int</code></pre><pre><span class="keyword">val</span> <a name="VALglyph_metrics"></a>glyph_metrics : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> int * int * int * int</code></pre><div class="info">
+<pre><span id="VALsize_utf8"><span class="keyword">val</span> size_utf8</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> int * int</code></pre><pre><span id="VALglyph_metrics"><span class="keyword">val</span> glyph_metrics</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> int * int * int * int</code></pre><div class="info">
 <b>Returns</b> the metrics (minx,maxx,miny,maxy) of a glyph<br>
 </div>
-<br><code><span class="keyword">type</span> <a name="TYPErender_kind"></a><code class="type"></code>render_kind = </code><table class="typetable">
+<br><code><span id="TYPErender_kind"><span class="keyword">type</span> <code class="type"></code>render_kind</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -159,9 +156,7 @@
 </div>
 
 <br>
-<a name="4_Textrenderingfunctions"></a>
-<h4>Text rendering functions</h4><br>
-<pre><span class="keyword">val</span> <a name="VALrender_text_solid"></a>render_text_solid : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_text_shaded"></a>render_text_shaded : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_text_blended"></a>render_text_blended : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_utf8_solid"></a>render_utf8_solid : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_utf8_shaded"></a>render_utf8_shaded : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_utf8_blended"></a>render_utf8_blended : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_text"></a>render_text : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPErender_kind">render_kind</a> -> string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><br>
-<a name="4_Glyphrenderingfunctions"></a>
-<h4>Glyph rendering functions</h4><br>
-<pre><span class="keyword">val</span> <a name="VALrender_glyph_solid"></a>render_glyph_solid : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_glyph_shaded"></a>render_glyph_shaded : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_glyph_blended"></a>render_glyph_blended : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALrender_glyph"></a>render_glyph : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPErender_kind">render_kind</a> -> char -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre></body></html>
\ No newline at end of file
+<span id="4_Textrenderingfunctions"><h4>Text rendering functions</h4></span><br>
+<pre><span id="VALrender_text_solid"><span class="keyword">val</span> render_text_solid</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_text_shaded"><span class="keyword">val</span> render_text_shaded</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_text_blended"><span class="keyword">val</span> render_text_blended</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_utf8_solid"><span class="keyword">val</span> render_utf8_solid</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_utf8_shaded"><span class="keyword">val</span> render_utf8_shaded</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_utf8_blended"><span class="keyword">val</span> render_utf8_blended</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> string -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_text"><span class="keyword">val</span> render_text</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPErender_kind">render_kind</a> -> string -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><br>
+<span id="4_Glyphrenderingfunctions"><h4>Glyph rendering functions</h4></span><br>
+<pre><span id="VALrender_glyph_solid"><span class="keyword">val</span> render_glyph_solid</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_glyph_shaded"><span class="keyword">val</span> render_glyph_shaded</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -><br>       char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> bg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_glyph_blended"><span class="keyword">val</span> render_glyph_blended</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> char -> fg:<a href="Sdlvideo.html#TYPEcolor">Sdlvideo.color</a> -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre><pre><span id="VALrender_glyph"><span class="keyword">val</span> render_glyph</span> : <code class="type"><a href="Sdlttf.html#TYPEfont">font</a> -> <a href="Sdlttf.html#TYPErender_kind">render_kind</a> -> char -> <a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a></code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlvideo.html ocamlsdl-0.9.0/doc/html/Sdlvideo.html
--- ocamlsdl-0.8.0/doc/html/Sdlvideo.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlvideo.html	2012-05-28 17:53:36.000000000 +0000
@@ -37,7 +37,7 @@
 <link title="Blitting" rel="Section" href="#3_Blitting">
 <link title="Palettes" rel="Subsection" href="#4_Palettes">
 <link title="Conversions" rel="Subsection" href="#4_Conversions">
-<title>OCamlSDL  : Sdlvideo</title>
+<title>OCamlSDL 0.9.0 : Sdlvideo</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlevent.html">Previous</a>
@@ -48,11 +48,10 @@
 <br>
 <pre><span class="keyword">module</span> Sdlvideo: <code class="code">sig</code> <a href="Sdlvideo.html">..</a> <code class="code">end</code></pre>Module for video manipulations<br>
 <hr width="100%">
-<pre><span class="keyword">exception</span> <a name="EXCEPTIONVideo_exn"></a>Video_exn <span class="keyword">of</span> <code class="type">string</code></pre>
+<pre><span id="EXCEPTIONVideo_exn"><span class="keyword">exception</span> Video_exn</span> <span class="keyword">of</span> <code class="type">string</code></pre>
 <br>
-<a name="3_Rectangles"></a>
-<h3>Rectangles</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPErect"></a><code class="type"></code>rect = {</code><table class="typetable">
+<span id="3_Rectangles"><h3>Rectangles</h3></span><br>
+<br><code><span id="TYPErect"><span class="keyword">type</span> <code class="type"></code>rect</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -87,13 +86,12 @@
 rectangular area (x, y, w, h)<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALrect"></a>rect : <code class="type">x:int -> y:int -> w:int -> h:int -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><pre><span class="keyword">val</span> <a name="VALcopy_rect"></a>copy_rect : <code class="type"><a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><div class="info">
+<pre><span id="VALrect"><span class="keyword">val</span> rect</span> : <code class="type">x:int -> y:int -> w:int -> h:int -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><pre><span id="VALcopy_rect"><span class="keyword">val</span> copy_rect</span> : <code class="type"><a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><div class="info">
 <b>Returns</b> a copy of the rectangle<br>
 </div>
 <br>
-<a name="3_Videomodeinformations"></a>
-<h3>Video mode informations</h3><br>
-<br><code><span class="keyword">type</span> <a name="TYPEpixel_format_info"></a><code class="type"></code>pixel_format_info = {</code><table class="typetable">
+<span id="3_Videomodeinformations"><h3>Video mode informations</h3></span><br>
+<br><code><span id="TYPEpixel_format_info"><span class="keyword">type</span> <code class="type"></code>pixel_format_info</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -219,7 +217,7 @@
 Structure describing how color are encoded as pixels<br>
 </div>
 
-<br><code><span class="keyword">type</span> <a name="TYPEvideo_info"></a><code class="type"></code>video_info = {</code><table class="typetable">
+<br><code><span id="TYPEvideo_info"><span class="keyword">type</span> <code class="type"></code>video_info</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -297,18 +295,18 @@
    <code class="code">set_video_mode</code>) or the current video mode.<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALget_video_info"></a>get_video_info : <code class="type">unit -> <a href="Sdlvideo.html#TYPEvideo_info">video_info</a></code></pre><div class="info">
+<pre><span id="VALget_video_info"><span class="keyword">val</span> get_video_info</span> : <code class="type">unit -> <a href="Sdlvideo.html#TYPEvideo_info">video_info</a></code></pre><div class="info">
 <b>Returns</b> information about the video hardware<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_video_info_format"></a>get_video_info_format : <code class="type">unit -> <a href="Sdlvideo.html#TYPEpixel_format_info">pixel_format_info</a></code></pre><div class="info">
+<pre><span id="VALget_video_info_format"><span class="keyword">val</span> get_video_info_format</span> : <code class="type">unit -> <a href="Sdlvideo.html#TYPEpixel_format_info">pixel_format_info</a></code></pre><div class="info">
 <b>Returns</b> information about the pixel format<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALdriver_name"></a>driver_name : <code class="type">unit -> string</code></pre><div class="info">
+<pre><span id="VALdriver_name"><span class="keyword">val</span> driver_name</span> : <code class="type">unit -> string</code></pre><div class="info">
 <b>Returns</b> the name of the video driver<br>
 </div>
-<pre><span class="keyword">type</span> <a name="TYPEvideo_flag"></a><code class="type"></code>video_flag = <code class="type">[ `ANYFORMAT<br>       | `ASYNCBLIT<br>       | `DOUBLEBUF<br>       | `FULLSCREEN<br>       | `HWPALETTE<br>       | `HWSURFACE<br>       | `NOFRAME<br>       | `OPENGL<br>       | `OPENGLBLIT<br>       | `RESIZABLE<br>       | `SWSURFACE ]</code> </pre>
+<pre><span id="TYPEvideo_flag"><span class="keyword">type</span> <code class="type"></code>video_flag</span> = <code class="type">[ `ANYFORMAT<br>       | `ASYNCBLIT<br>       | `DOUBLEBUF<br>       | `FULLSCREEN<br>       | `HWPALETTE<br>       | `HWSURFACE<br>       | `NOFRAME<br>       | `OPENGL<br>       | `OPENGLBLIT<br>       | `RESIZABLE<br>       | `SWSURFACE ]</code> </pre>
 
-<br><code><span class="keyword">type</span> <a name="TYPEmodes"></a><code class="type"></code>modes = </code><table class="typetable">
+<br><code><span id="TYPEmodes"><span class="keyword">type</span> <code class="type"></code>modes</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -332,11 +330,11 @@
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALlist_modes"></a>list_modes : <code class="type">?bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> <a href="Sdlvideo.html#TYPEmodes">modes</a></code></pre><div class="info">
+<pre><span id="VALlist_modes"><span class="keyword">val</span> list_modes</span> : <code class="type">?bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> <a href="Sdlvideo.html#TYPEmodes">modes</a></code></pre><div class="info">
 <b>Returns</b> a list of available screen dimensions for the given format 
   and video flags, sorted largest to smallest or NOMODE or ANY<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALvideo_mode_ok"></a>video_mode_ok : <code class="type">w:int -> h:int -> bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> int</code></pre><div class="info">
+<pre><span id="VALvideo_mode_ok"><span class="keyword">val</span> video_mode_ok</span> : <code class="type">w:int -> h:int -> bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> int</code></pre><div class="info">
 Check to see if a particular video mode is supported.<br>
 <b>Returns</b> 0 if the requested mode is not supported or returns the
    bits-per-pixel of the closest available mode with the given width
@@ -345,16 +343,15 @@
    emulate the requested bits-per-pixel with a shadow surface.<br>
 </div>
 <br>
-<a name="3_Surfaces"></a>
-<h3>Surfaces</h3><br>
-<pre><span class="keyword">type</span> <a name="TYPEsurface"></a><code class="type"></code>surface </pre>
+<span id="3_Surfaces"><h3>Surfaces</h3></span><br>
+<pre><span id="TYPEsurface"><span class="keyword">type</span> <code class="type"></code>surface</span> </pre>
 <div class="info">
 Graphical surface datatype<br>
 </div>
 
-<pre><span class="keyword">type</span> <a name="TYPEsurface_flags"></a><code class="type"></code>surface_flags = <code class="type">[ `ANYFORMAT<br>       | `ASYNCBLIT<br>       | `DOUBLEBUF<br>       | `FULLSCREEN<br>       | `HWACCEL<br>       | `HWPALETTE<br>       | `HWSURFACE<br>       | `NOFRAME<br>       | `OPENGL<br>       | `OPENGLBLIT<br>       | `PREALLOC<br>       | `RESIZABLE<br>       | `RLEACCEL<br>       | `SRCALPHA<br>       | `SRCCOLORKEY<br>       | `SWSURFACE ]</code> </pre>
+<pre><span id="TYPEsurface_flags"><span class="keyword">type</span> <code class="type"></code>surface_flags</span> = <code class="type">[ `ANYFORMAT<br>       | `ASYNCBLIT<br>       | `DOUBLEBUF<br>       | `FULLSCREEN<br>       | `HWACCEL<br>       | `HWPALETTE<br>       | `HWSURFACE<br>       | `NOFRAME<br>       | `OPENGL<br>       | `OPENGLBLIT<br>       | `PREALLOC<br>       | `RESIZABLE<br>       | `RLEACCEL<br>       | `SRCALPHA<br>       | `SRCCOLORKEY<br>       | `SWSURFACE ]</code> </pre>
 
-<br><code><span class="keyword">type</span> <a name="TYPEsurface_info"></a><code class="type"></code>surface_info = {</code><table class="typetable">
+<br><code><span id="TYPEsurface_info"><span class="keyword">type</span> <code class="type"></code>surface_info</span> = {</code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code>&nbsp;&nbsp;</code></td>
@@ -400,46 +397,45 @@
 }
 
 
-<pre><span class="keyword">val</span> <a name="VALsurface_info"></a>surface_info : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface_info">surface_info</a></code></pre><div class="info">
+<pre><span id="VALsurface_info"><span class="keyword">val</span> surface_info</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface_info">surface_info</a></code></pre><div class="info">
 <b>Returns</b> information for the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsurface_format"></a>surface_format : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEpixel_format_info">pixel_format_info</a></code></pre><div class="info">
+<pre><span id="VALsurface_format"><span class="keyword">val</span> surface_format</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEpixel_format_info">pixel_format_info</a></code></pre><div class="info">
 <b>Returns</b> pixel format information for the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsurface_dims"></a>surface_dims : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int * int * int</code></pre><div class="info">
+<pre><span id="VALsurface_dims"><span class="keyword">val</span> surface_dims</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int * int * int</code></pre><div class="info">
 <b>Returns</b> width, height and pitch of the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsurface_flags"></a>surface_flags : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface_flags">surface_flags</a> list</code></pre><div class="info">
+<pre><span id="VALsurface_flags"><span class="keyword">val</span> surface_flags</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface_flags">surface_flags</a> list</code></pre><div class="info">
 <b>Returns</b> flag list for the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsurface_bpp"></a>surface_bpp : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
+<pre><span id="VALsurface_bpp"><span class="keyword">val</span> surface_bpp</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
 <b>Returns</b> bits-per-pixel for the given <code class="code">surface</code><br>
 </div>
 <br>
-<a name="3_Videomodesrelatedfunctions"></a>
-<h3>Video modes-related functions</h3><br>
-<pre><span class="keyword">val</span> <a name="VALget_video_surface"></a>get_video_surface : <code class="type">unit -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<span id="3_Videomodesrelatedfunctions"><h3>Video modes-related functions</h3></span><br>
+<pre><span id="VALget_video_surface"><span class="keyword">val</span> get_video_surface</span> : <code class="type">unit -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 <b>Returns</b> the current display <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_video_mode"></a>set_video_mode : <code class="type">w:int -> h:int -> ?bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<pre><span id="VALset_video_mode"><span class="keyword">val</span> set_video_mode</span> : <code class="type">w:int -> h:int -> ?bpp:int -> <a href="Sdlvideo.html#TYPEvideo_flag">video_flag</a> list -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 Set up a video mode with the specified <code class="code">width</code>, <code class="code">height</code> and
    <code class="code">bits-per-pixel</code>.<br>
 <b>Returns</b> the current display <code class="code">surface</code><br>
 </div>
 <div class="param_info"><code class="code">bpp</code> : if omited, it is treated as the current display bits per
    pixel</div>
-<pre><span class="keyword">val</span> <a name="VALupdate_rect"></a>update_rect : <code class="type">?rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALupdate_rect"><span class="keyword">val</span> update_rect</span> : <code class="type">?rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 </div>
 <div class="param_info"><code class="code">rect</code> : makes sure the given area is updated on the given
    screen. The rectangle must be confined within the screen boundaries
    (no clipping is done). Updates the entire screen if omitted</div>
-<pre><span class="keyword">val</span> <a name="VALupdate_rects"></a>update_rects : <code class="type"><a href="Sdlvideo.html#TYPErect">rect</a> list -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALupdate_rects"><span class="keyword">val</span> update_rects</span> : <code class="type"><a href="Sdlvideo.html#TYPErect">rect</a> list -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 Makes sure the given list of rectangles is updated on the given
    screen. The rectangles must all be confined within the screen
    boundaries (no clipping is done).
    This function should not be called while screen is locked.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALflip"></a>flip : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALflip"><span class="keyword">val</span> flip</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 Swaps screen buffers.
 <p>
 
@@ -453,33 +449,31 @@
   calling <code class="code">update_rect</code><br>
 </div>
 <br>
-<a name="3_Colormanipulation"></a>
-<h3>Color manipulation</h3><br>
-<pre><span class="keyword">val</span> <a name="VALset_gamma"></a>set_gamma : <code class="type">r:float -> g:float -> b:float -> unit</code></pre><div class="info">
+<span id="3_Colormanipulation"><h3>Color manipulation</h3></span><br>
+<pre><span id="VALset_gamma"><span class="keyword">val</span> set_gamma</span> : <code class="type">r:float -> g:float -> b:float -> unit</code></pre><div class="info">
 Set the gamma correction for each of the color channels. 
   The gamma values range (approximately) between 0.1 and 10.0 
   If this function isn't supported directly by the hardware, it will
   be emulated using gamma ramps, if available.<br>
 </div>
-<pre><span class="keyword">type</span> <a name="TYPEcolor"></a><code class="type"></code>color = <code class="type">int * int * int</code> </pre>
+<pre><span id="TYPEcolor"><span class="keyword">type</span> <code class="type"></code>color</span> = <code class="type">int * int * int</code> </pre>
 <div class="info">
 Format independent color description <code class="code">(r,g,b)</code> are 8 bits unsigned
    integers<br>
 </div>
 
-<pre><span class="keyword">val</span> <a name="VALblack"></a>black : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALwhite"></a>white : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALred"></a>red : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALgreen"></a>green : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALblue"></a>blue : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALyellow"></a>yellow : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALcyan"></a>cyan : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span class="keyword">val</span> <a name="VALmagenta"></a>magenta : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><br>
-<a name="4_Palettes"></a>
-<h4>Palettes</h4><br>
-<pre><span class="keyword">val</span> <a name="VALuse_palette"></a>use_palette : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> bool</code></pre><div class="info">
+<pre><span id="VALblack"><span class="keyword">val</span> black</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALwhite"><span class="keyword">val</span> white</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALred"><span class="keyword">val</span> red</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALgreen"><span class="keyword">val</span> green</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALblue"><span class="keyword">val</span> blue</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALyellow"><span class="keyword">val</span> yellow</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALcyan"><span class="keyword">val</span> cyan</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><pre><span id="VALmagenta"><span class="keyword">val</span> magenta</span> : <code class="type"><a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><br>
+<span id="4_Palettes"><h4>Palettes</h4></span><br>
+<pre><span id="VALuse_palette"><span class="keyword">val</span> use_palette</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> bool</code></pre><div class="info">
 <b>Returns</b> <code class="code">true</code> if surface use indexed colors<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALpalette_ncolors"></a>palette_ncolors : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
+<pre><span id="VALpalette_ncolors"><span class="keyword">val</span> palette_ncolors</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
 Number of colors in the surface's palette<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_palette_color"></a>get_palette_color : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
+<pre><span id="VALget_palette_color"><span class="keyword">val</span> get_palette_color</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
 Retrieve a color by its index in a surface's palette<br>
 </div>
-<br><code><span class="keyword">type</span> <a name="TYPEpalette_flag"></a><code class="type"></code>palette_flag = </code><table class="typetable">
+<br><code><span id="TYPEpalette_flag"><span class="keyword">type</span> <code class="type"></code>palette_flag</span> = </code><table class="typetable">
 <tr>
 <td align="left" valign="top" >
 <code><span class="keyword">|</span></code></td>
@@ -505,109 +499,101 @@
 </tr></table>
 
 
-<pre><span class="keyword">val</span> <a name="VALset_palette"></a>set_palette : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       ?flag:<a href="Sdlvideo.html#TYPEpalette_flag">palette_flag</a> -><br>       ?firstcolor:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> array -> unit</code></pre><div class="info">
+<pre><span id="VALset_palette"><span class="keyword">val</span> set_palette</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       ?flag:<a href="Sdlvideo.html#TYPEpalette_flag">palette_flag</a> -><br>       ?firstcolor:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> array -> unit</code></pre><div class="info">
 Sets a portion of the palette for a given 8-bit <code class="code">surface</code>.<br>
 </div>
 <div class="param_info"><code class="code">flag</code> : defaults to LOGPHYSPAL</div>
 <div class="param_info"><code class="code">firstcolor</code> : where to blit the color array given as argument
    (defaults to 0)</div>
 <br>
-<a name="4_Conversions"></a>
-<h4>Conversions</h4><br>
-<pre><span class="keyword">val</span> <a name="VALmap_RGB"></a>map_RGB : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?alpha:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> -> int32</code></pre><div class="info">
+<span id="4_Conversions"><h4>Conversions</h4></span><br>
+<pre><span id="VALmap_RGB"><span class="keyword">val</span> map_RGB</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?alpha:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> -> int32</code></pre><div class="info">
 Maps an RGB triple or an RGBA quadruple to a pixel value for a given 
   pixel format<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_RGB"></a>get_RGB : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
+<pre><span id="VALget_RGB"><span class="keyword">val</span> get_RGB</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
 Maps a pixel value into the RGB components for a given pixel format<br>
 <b>Returns</b> RGB color<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_RGBA"></a>get_RGBA : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> <a href="Sdlvideo.html#TYPEcolor">color</a> * int</code></pre><div class="info">
+<pre><span id="VALget_RGBA"><span class="keyword">val</span> get_RGBA</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> <a href="Sdlvideo.html#TYPEcolor">color</a> * int</code></pre><div class="info">
 Maps a pixel value into the RGBA components for a given pixel format *<br>
 <b>Returns</b> RGB color and alpha value<br>
 </div>
 <br>
-<a name="3_CreatingRGBsurface"></a>
-<h3>Creating RGB surface</h3><br>
-<pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface"></a>create_RGB_surface : <code class="type">[ `ASYNCBLIT | `HWSURFACE | `SRCALPHA | `SRCCOLORKEY | `SWSURFACE ] list -><br>       w:int -><br>       h:int -><br>       bpp:int -><br>       rmask:int32 -> gmask:int32 -> bmask:int32 -> amask:int32 -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<span id="3_CreatingRGBsurface"><h3>Creating RGB surface</h3></span><br>
+<pre><span id="VALcreate_RGB_surface"><span class="keyword">val</span> create_RGB_surface</span> : <code class="type">[ `ASYNCBLIT | `HWSURFACE | `SRCALPHA | `SRCCOLORKEY | `SWSURFACE ] list -><br>       w:int -><br>       h:int -><br>       bpp:int -><br>       rmask:int32 -> gmask:int32 -> bmask:int32 -> amask:int32 -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 Creates a RGB surface.
   If the depth is 4 or 8 bits, an empty palette is allocated 
   for the surface. If the depth is greater than 8 bits, the pixel format is 
   set using the given masks.<br>
 <b>Returns</b> the new surface<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface_format"></a>create_RGB_surface_format : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       [ `ASYNCBLIT | `HWSURFACE | `SRCALPHA | `SRCCOLORKEY | `SWSURFACE ] list -><br>       w:int -> h:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<pre><span id="VALcreate_RGB_surface_format"><span class="keyword">val</span> create_RGB_surface_format</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       [ `ASYNCBLIT | `HWSURFACE | `SRCALPHA | `SRCCOLORKEY | `SWSURFACE ] list -><br>       w:int -> h:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 Creates a RGB surface with the same pixel format as the first
    parameter.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface_from_32"></a>create_RGB_surface_from_32 : <code class="type">(int32, Bigarray.int32_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int32 -> gmask:int32 -> bmask:int32 -> amask:int32 -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface_from_24"></a>create_RGB_surface_from_24 : <code class="type">(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface_from_16"></a>create_RGB_surface_from_16 : <code class="type">(int, Bigarray.int16_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span class="keyword">val</span> <a name="VALcreate_RGB_surface_from_8"></a>create_RGB_surface_from_8 : <code class="type">(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><br>
-<a name="3_LockingUnlockingsurface"></a>
-<h3>Locking/Unlocking surface</h3><br>
-<pre><span class="keyword">val</span> <a name="VALmust_lock"></a>must_lock : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> bool</code></pre><div class="info">
+<pre><span id="VALcreate_RGB_surface_from_32"><span class="keyword">val</span> create_RGB_surface_from_32</span> : <code class="type">(int32, Bigarray.int32_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int32 -> gmask:int32 -> bmask:int32 -> amask:int32 -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span id="VALcreate_RGB_surface_from_24"><span class="keyword">val</span> create_RGB_surface_from_24</span> : <code class="type">(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span id="VALcreate_RGB_surface_from_16"><span class="keyword">val</span> create_RGB_surface_from_16</span> : <code class="type">(int, Bigarray.int16_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><pre><span id="VALcreate_RGB_surface_from_8"><span class="keyword">val</span> create_RGB_surface_from_8</span> : <code class="type">(int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t -><br>       w:int -><br>       h:int -><br>       pitch:int -><br>       rmask:int -> gmask:int -> bmask:int -> amask:int -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><br>
+<span id="3_LockingUnlockingsurface"><h3>Locking/Unlocking surface</h3></span><br>
+<pre><span id="VALmust_lock"><span class="keyword">val</span> must_lock</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> bool</code></pre><div class="info">
 <b>Returns</b> <code class="code">true</code> if the surface should be locked before accessing
    its pixels<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALlock"></a>lock : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALlock"><span class="keyword">val</span> lock</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 Sets up a surface for directly accessing the pixels.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALunlock"></a>unlock : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALunlock"><span class="keyword">val</span> unlock</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 Releases the lock on the given <code class="code">surface</code><br>
 </div>
 <br>
-<a name="3_Accessingsurfacepixels"></a>
-<h3>Accessing surface pixels</h3><br>
-<pre><span class="keyword">val</span> <a name="VALpixel_data"></a>pixel_data : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span class="keyword">val</span> <a name="VALpixel_data_8"></a>pixel_data_8 : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span class="keyword">val</span> <a name="VALpixel_data_16"></a>pixel_data_16 : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int16_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span class="keyword">val</span> <a name="VALpixel_data_24"></a>pixel_data_24 : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span class="keyword">val</span> <a name="VALpixel_data_32"></a>pixel_data_32 : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int32, Bigarray.int32_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span class="keyword">val</span> <a name="VALget_pixel"></a>get_pixel : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> int32</code></pre><pre><span class="keyword">val</span> <a name="VALget_pixel_color"></a>get_pixel_color : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
+<span id="3_Accessingsurfacepixels"><h3>Accessing surface pixels</h3></span><br>
+<pre><span id="VALpixel_data"><span class="keyword">val</span> pixel_data</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span id="VALpixel_data_8"><span class="keyword">val</span> pixel_data_8</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span id="VALpixel_data_16"><span class="keyword">val</span> pixel_data_16</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int16_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span id="VALpixel_data_24"><span class="keyword">val</span> pixel_data_24</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span id="VALpixel_data_32"><span class="keyword">val</span> pixel_data_32</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       (int32, Bigarray.int32_elt, Bigarray.c_layout) Bigarray.Array1.t</code></pre><pre><span id="VALget_pixel"><span class="keyword">val</span> get_pixel</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> int32</code></pre><pre><span id="VALget_pixel_color"><span class="keyword">val</span> get_pixel_color</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> <a href="Sdlvideo.html#TYPEcolor">color</a></code></pre><div class="info">
 Access an individual pixel on a surface and returns is as a <code class="code">color</code>.
    The surface may have to be locked before access.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALput_pixel"></a>put_pixel : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> int32 -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALput_pixel_color"></a>put_pixel_color : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> -> unit</code></pre><div class="info">
+<pre><span id="VALput_pixel"><span class="keyword">val</span> put_pixel</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> int32 -> unit</code></pre><pre><span id="VALput_pixel_color"><span class="keyword">val</span> put_pixel_color</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> x:int -> y:int -> <a href="Sdlvideo.html#TYPEcolor">color</a> -> unit</code></pre><div class="info">
 Sets an individual pixel on a surface.
    The surface may have to be locked before access.<br>
 </div>
 <br>
-<a name="3_ReadingwritinginBMPfiles"></a>
-<h3>Reading/writing in BMP files</h3><br>
-<pre><span class="keyword">val</span> <a name="VALload_BMP"></a>load_BMP : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<span id="3_ReadingwritinginBMPfiles"><h3>Reading/writing in BMP files</h3></span><br>
+<pre><span id="VALload_BMP"><span class="keyword">val</span> load_BMP</span> : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 Loads a surface from a named Windows BMP file.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALload_BMP_from_mem"></a>load_BMP_from_mem : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<pre><span id="VALload_BMP_from_mem"><span class="keyword">val</span> load_BMP_from_mem</span> : <code class="type">string -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 Loads a BMP image from a memory buffer.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALsave_BMP"></a>save_BMP : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> string -> unit</code></pre><div class="info">
+<pre><span id="VALsave_BMP"><span class="keyword">val</span> save_BMP</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> string -> unit</code></pre><div class="info">
 Saves the <code class="code">surface</code> as a Windows BMP file named file.<br>
 </div>
 <br>
-<a name="3_Colorkeyandalphastuff"></a>
-<h3>Colorkey and alpha stuff</h3><br>
-<pre><span class="keyword">val</span> <a name="VALunset_color_key"></a>unset_color_key : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_color_key"></a>set_color_key : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?rle:bool -> int32 -> unit</code></pre><div class="info">
+<span id="3_Colorkeyandalphastuff"><h3>Colorkey and alpha stuff</h3></span><br>
+<pre><span id="VALunset_color_key"><span class="keyword">val</span> unset_color_key</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><pre><span id="VALset_color_key"><span class="keyword">val</span> set_color_key</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?rle:bool -> int32 -> unit</code></pre><div class="info">
 Sets the color key (transparent pixel) in a blittable <code class="code">surface</code>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_color_key"></a>get_color_key : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32</code></pre><div class="info">
+<pre><span id="VALget_color_key"><span class="keyword">val</span> get_color_key</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32</code></pre><div class="info">
 <b>Returns</b> the color key of the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALunset_alpha"></a>unset_alpha : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><pre><span class="keyword">val</span> <a name="VALset_alpha"></a>set_alpha : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?rle:bool -> int -> unit</code></pre><div class="info">
+<pre><span id="VALunset_alpha"><span class="keyword">val</span> unset_alpha</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><pre><span id="VALset_alpha"><span class="keyword">val</span> set_alpha</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?rle:bool -> int -> unit</code></pre><div class="info">
 sets the alpha value for the entire <code class="code">surface</code>, as opposed to
    using the alpha component of each pixel.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_alpha"></a>get_alpha : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
+<pre><span id="VALget_alpha"><span class="keyword">val</span> get_alpha</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> int</code></pre><div class="info">
 <b>Returns</b> the alpha value of the given <code class="code">surface</code><br>
 </div>
 <br>
-<a name="3_Clipping"></a>
-<h3>Clipping</h3><br>
-<pre><span class="keyword">val</span> <a name="VALunset_clip_rect"></a>unset_clip_rect : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
+<span id="3_Clipping"><h3>Clipping</h3></span><br>
+<pre><span id="VALunset_clip_rect"><span class="keyword">val</span> unset_clip_rect</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> unit</code></pre><div class="info">
 disable clipping for the given <code class="code">surface</code><br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_clip_rect"></a>set_clip_rect : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPErect">rect</a> -> unit</code></pre><div class="info">
+<pre><span id="VALset_clip_rect"><span class="keyword">val</span> set_clip_rect</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPErect">rect</a> -> unit</code></pre><div class="info">
 Sets the clipping rectangle for the destination <code class="code">surface</code> in a blit.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_clip_rect"></a>get_clip_rect : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><div class="info">
+<pre><span id="VALget_clip_rect"><span class="keyword">val</span> get_clip_rect</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPErect">rect</a></code></pre><div class="info">
 <b>Returns</b> the clipping rectangle for the destination <code class="code">surface</code> in a blit.<br>
 </div>
 <br>
-<a name="3_Blitting"></a>
-<h3>Blitting</h3><br>
-<pre><span class="keyword">val</span> <a name="VALblit_surface"></a>blit_surface : <code class="type">src:<a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       ?src_rect:<a href="Sdlvideo.html#TYPErect">rect</a> -><br>       dst:<a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?dst_rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> unit -> unit</code></pre><div class="info">
+<span id="3_Blitting"><h3>Blitting</h3></span><br>
+<pre><span id="VALblit_surface"><span class="keyword">val</span> blit_surface</span> : <code class="type">src:<a href="Sdlvideo.html#TYPEsurface">surface</a> -><br>       ?src_rect:<a href="Sdlvideo.html#TYPErect">rect</a> -><br>       dst:<a href="Sdlvideo.html#TYPEsurface">surface</a> -> ?dst_rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> unit -> unit</code></pre><div class="info">
 Performs a fast blit from the source <code class="code">surface</code> 
    to the destination <code class="code">surface</code>.<br>
 </div>
@@ -623,10 +609,10 @@
 <p>
 
    The blit function should not be called on a locked surface.</div>
-<pre><span class="keyword">val</span> <a name="VALfill_rect"></a>fill_rect : <code class="type">?rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> unit</code></pre><div class="info">
+<pre><span id="VALfill_rect"><span class="keyword">val</span> fill_rect</span> : <code class="type">?rect:<a href="Sdlvideo.html#TYPErect">rect</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> int32 -> unit</code></pre><div class="info">
 performs a fast fill of the given rectangle with 'color'<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALdisplay_format"></a>display_format : <code class="type">?alpha:bool -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
+<pre><span id="VALdisplay_format"><span class="keyword">val</span> display_format</span> : <code class="type">?alpha:bool -> <a href="Sdlvideo.html#TYPEsurface">surface</a> -> <a href="Sdlvideo.html#TYPEsurface">surface</a></code></pre><div class="info">
 This function takes a surface and copies it to a new surface of the
    pixel format and colors of the video framebuffer, suitable for fast
    blitting onto the display surface.<br>
diff -Nru ocamlsdl-0.8.0/doc/html/Sdlwm.html ocamlsdl-0.9.0/doc/html/Sdlwm.html
--- ocamlsdl-0.8.0/doc/html/Sdlwm.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/Sdlwm.html	2012-05-28 17:53:37.000000000 +0000
@@ -23,7 +23,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlwm</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlwm</title>
 </head>
 <body>
 <div class="navbar"><a href="Sdlvideo.html">Previous</a>
@@ -34,34 +34,34 @@
 <br>
 <pre><span class="keyword">module</span> Sdlwm: <code class="code">sig</code> <a href="Sdlwm.html">..</a> <code class="code">end</code></pre>Window Manager interaction<br>
 <hr width="100%">
-<pre><span class="keyword">val</span> <a name="VALset_caption"></a>set_caption : <code class="type">title:string -> icon:string -> unit</code></pre><div class="info">
+<pre><span id="VALset_caption"><span class="keyword">val</span> set_caption</span> : <code class="type">title:string -> icon:string -> unit</code></pre><div class="info">
 Sets the title and icon text of the display window<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALget_caption"></a>get_caption : <code class="type">unit -> string * string</code></pre><div class="info">
+<pre><span id="VALget_caption"><span class="keyword">val</span> get_caption</span> : <code class="type">unit -> string * string</code></pre><div class="info">
 Gets the title and icon text of the display window<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALset_icon"></a>set_icon : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> unit</code></pre><div class="info">
+<pre><span id="VALset_icon"><span class="keyword">val</span> set_icon</span> : <code class="type"><a href="Sdlvideo.html#TYPEsurface">Sdlvideo.surface</a> -> unit</code></pre><div class="info">
 Sets the icon for the display window. 
    This function must be called before the first call to 
    <a href="Sdlvideo.html#VALset_video_mode"><code class="code">Sdlvideo.set_video_mode</code></a>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALiconify"></a>iconify : <code class="type">unit -> bool</code></pre><div class="info">
+<pre><span id="VALiconify"><span class="keyword">val</span> iconify</span> : <code class="type">unit -> bool</code></pre><div class="info">
 This function iconifies the window, and returns <code class="code">true</code> if it
    succeeded.  If the function succeeds, it generates an
    <a href="Sdlevent.html#TYPEactive_event"><code class="code">Sdlevent.active_event</code></a> loss event.  This function is a noop and
    returns <code class="code">false</code> in non-windowed environments.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALtoggle_fullscreen"></a>toggle_fullscreen : <code class="type">unit -> bool</code></pre><div class="info">
+<pre><span id="VALtoggle_fullscreen"><span class="keyword">val</span> toggle_fullscreen</span> : <code class="type">unit -> bool</code></pre><div class="info">
 Toggle fullscreen mode without changing the contents of the
   screen.  If this function was able to toggle fullscreen mode (change
   from running in a window to fullscreen, or vice-versa), it will
   return <code class="code">true</code>.  If it is not implemented, or fails, it returns
   <code class="code">false</code>.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALgrab_input"></a>grab_input : <code class="type">bool -> unit</code></pre><div class="info">
+<pre><span id="VALgrab_input"><span class="keyword">val</span> grab_input</span> : <code class="type">bool -> unit</code></pre><div class="info">
 Set the input grab state of the application.  Grabbing means that
    the mouse is confined to the application window, and nearly all
    keyboard input is passed directly to the application, and not
    interpreted by a window manager, if any.<br>
 </div>
-<pre><span class="keyword">val</span> <a name="VALquery_grab"></a>query_grab : <code class="type">unit -> bool</code></pre></body></html>
\ No newline at end of file
+<pre><span id="VALquery_grab"><span class="keyword">val</span> query_grab</span> : <code class="type">unit -> bool</code></pre></body></html>
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/style.css ocamlsdl-0.9.0/doc/html/style.css
--- ocamlsdl-0.8.0/doc/html/style.css	2010-04-19 19:05:07.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/style.css	2012-05-28 17:53:36.000000000 +0000
@@ -30,4 +30,5 @@
 tr { background-color : White }
 td.typefieldcomment { background-color : #FFFFFF ; font-size: smaller ;}
 pre { margin-bottom: 4px }
-div.sig_block {margin-left: 2em}
\ No newline at end of file
+div.sig_block {margin-left: 2em}
+*:target { background: yellow; } 
\ No newline at end of file
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlcdrom.html ocamlsdl-0.9.0/doc/html/type_Sdlcdrom.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlcdrom.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlcdrom.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlcdrom</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlcdrom</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlevent.html ocamlsdl-0.9.0/doc/html/type_Sdlevent.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlevent.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlevent.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlevent</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlevent</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlevent.Old.html ocamlsdl-0.9.0/doc/html/type_Sdlevent.Old.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlevent.Old.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlevent.Old.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlevent.Old</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlevent.Old</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlgfx.html ocamlsdl-0.9.0/doc/html/type_Sdlgfx.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlgfx.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlgfx.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlgfx</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlgfx</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdl.html ocamlsdl-0.9.0/doc/html/type_Sdl.html
--- ocamlsdl-0.8.0/doc/html/type_Sdl.html	2010-04-19 20:50:49.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdl.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdl</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdl</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdljoystick.html ocamlsdl-0.9.0/doc/html/type_Sdljoystick.html
--- ocamlsdl-0.8.0/doc/html/type_Sdljoystick.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdljoystick.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdljoystick</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdljoystick</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlkey.html ocamlsdl-0.9.0/doc/html/type_Sdlkey.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlkey.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlkey.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlkey</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlkey</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlloader.html ocamlsdl-0.9.0/doc/html/type_Sdlloader.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlloader.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlloader.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlloader</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlloader</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlmixer.html ocamlsdl-0.9.0/doc/html/type_Sdlmixer.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlmixer.html	2010-04-19 20:50:51.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlmixer.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlmixer</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlmixer</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
@@ -49,6 +49,8 @@
 &nbsp;&nbsp;<span class="keyword">external</span>&nbsp;loadWAV&nbsp;:&nbsp;string&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Sdlmixer</span>.chunk&nbsp;=&nbsp;<span class="string">"sdlmixer_loadWAV"</span><br>
 &nbsp;&nbsp;<span class="keyword">val</span>&nbsp;loadWAV_from_mem&nbsp;:&nbsp;string&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Sdlmixer</span>.chunk<br>
 &nbsp;&nbsp;<span class="keyword">external</span>&nbsp;load_string&nbsp;:&nbsp;string&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Sdlmixer</span>.chunk&nbsp;=&nbsp;<span class="string">"sdlmixer_load_string"</span><br>
+&nbsp;&nbsp;<span class="keyword">external</span>&nbsp;load_string_raw&nbsp;:&nbsp;string&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;<span class="constructor">Sdlmixer</span>.chunk<br>
+&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;<span class="string">"sdlmixer_load_string_raw"</span><br>
 &nbsp;&nbsp;<span class="keyword">external</span>&nbsp;volume_chunk&nbsp;:&nbsp;<span class="constructor">Sdlmixer</span>.chunk&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;float&nbsp;=&nbsp;<span class="string">"sdlmixer_volume_chunk"</span><br>
 &nbsp;&nbsp;<span class="keyword">external</span>&nbsp;setvolume_chunk&nbsp;:&nbsp;<span class="constructor">Sdlmixer</span>.chunk&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;float&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit<br>
 &nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;<span class="string">"sdlmixer_setvolume_chunk"</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlmouse.html ocamlsdl-0.9.0/doc/html/type_Sdlmouse.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlmouse.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlmouse.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlmouse</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlmouse</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
@@ -28,6 +28,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;<span class="keywordsign">|</span>&nbsp;<span class="constructor">BUTTON_RIGHT</span><br>
 &nbsp;&nbsp;&nbsp;&nbsp;<span class="keywordsign">|</span>&nbsp;<span class="constructor">BUTTON_WHEELUP</span><br>
 &nbsp;&nbsp;&nbsp;&nbsp;<span class="keywordsign">|</span>&nbsp;<span class="constructor">BUTTON_WHEELDOWN</span><br>
+&nbsp;&nbsp;&nbsp;&nbsp;<span class="keywordsign">|</span>&nbsp;<span class="constructor">BUTTON_X</span>&nbsp;<span class="keyword">of</span>&nbsp;int<br>
 &nbsp;&nbsp;<span class="keyword">external</span>&nbsp;get_state&nbsp;:<br>
 &nbsp;&nbsp;&nbsp;&nbsp;?relative:bool&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;unit&nbsp;<span class="keywordsign">-&gt;</span>&nbsp;int&nbsp;*&nbsp;int&nbsp;*&nbsp;<span class="constructor">Sdlmouse</span>.button&nbsp;list<br>
 &nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;<span class="string">"mlsdlevent_get_mouse_state"</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdltimer.html ocamlsdl-0.9.0/doc/html/type_Sdltimer.html
--- ocamlsdl-0.8.0/doc/html/type_Sdltimer.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdltimer.html	2012-05-28 17:53:36.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdltimer</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdltimer</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlttf.html ocamlsdl-0.9.0/doc/html/type_Sdlttf.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlttf.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlttf.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlttf</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlttf</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlvideo.html ocamlsdl-0.9.0/doc/html/type_Sdlvideo.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlvideo.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlvideo.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlvideo</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlvideo</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/html/type_Sdlwm.html ocamlsdl-0.9.0/doc/html/type_Sdlwm.html
--- ocamlsdl-0.8.0/doc/html/type_Sdlwm.html	2010-04-19 20:50:50.000000000 +0000
+++ ocamlsdl-0.9.0/doc/html/type_Sdlwm.html	2012-05-28 17:53:37.000000000 +0000
@@ -18,7 +18,7 @@
 <link title="Sdlttf" rel="Chapter" href="Sdlttf.html">
 <link title="Sdlloader" rel="Chapter" href="Sdlloader.html">
 <link title="Sdlmixer" rel="Chapter" href="Sdlmixer.html">
-<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL  : Sdlwm</title>
+<link title="Sdlgfx" rel="Chapter" href="Sdlgfx.html"><title>OCamlSDL 0.9.0 : Sdlwm</title>
 </head>
 <body>
 <code class="code"><span class="keyword">sig</span><br>
diff -Nru ocamlsdl-0.8.0/doc/ocamlsdl.info ocamlsdl-0.9.0/doc/ocamlsdl.info
--- ocamlsdl-0.8.0/doc/ocamlsdl.info	2010-04-19 20:50:55.000000000 +0000
+++ ocamlsdl-0.9.0/doc/ocamlsdl.info	2012-05-28 17:54:47.000000000 +0000
@@ -3,17 +3,17 @@
 
 INFO-DIR-SECTION Objective Caml
 START-INFO-DIR-ENTRY
-* OCamlSDL : (ocamlsdl).
+* OCamlSDL 0.9.0: (ocamlsdl).
 END-INFO-DIR-ENTRY
    This file was generated by Ocamldoc using the Texinfo generator.
 
 
 File: ocamlsdl.info,  Node: Top,  Up: (dir)
 
-OCamlSDL
-********
+OCamlSDL 0.9.0
+**************
 
-Documentation for OCamlSDL
+Documentation for OCamlSDL 0.9.0
 
 * Menu:
 
@@ -960,6 +960,9 @@
   | BUTTON_RIGHT
   | BUTTON_WHEELUP
   | BUTTON_WHEELDOWN
+  | BUTTON_X of int
+     (* BUTTON_X is only seen in a Sdlevent.mousebutton_event,
+        it is not returned by Sdlmouse.get_state *)
 
 
  - val get_state :
@@ -2621,6 +2624,12 @@
    Load a wave file of the mixer format from a memory buffer
 
 
+ - val load_string_raw :
+     string -> chunk
+   
+   Load raw audio data of the mixer format from a memory buffer
+
+
  - val volume_chunk :
      chunk -> float
    
@@ -3091,24 +3100,24 @@
 
 * active_event:                          Sdlevent.            (line  58)
 * active_state:                          Sdlevent.            (line  37)
-* button:                                Sdlmouse.            (line  24)
+* button:                                Sdlmouse.            (line  27)
 * cdrom_drive:                           Sdlcdrom.            (line  29)
 * cdrom_drive_status:                    Sdlcdrom.            (line  42)
 * cdrom_info:                            Sdlcdrom.            (line  69)
-* channel:                               Sdlmixer.            (line 131)
+* channel:                               Sdlmixer.            (line 137)
 * channels:                              Sdlmixer.            (line  53)
 * chunk:                                 Sdlmixer.            (line  95)
 * color:                                 Sdlvideo.            (line 293)
-* cursor:                                Sdlmouse.            (line  44)
-* cursor_data:                           Sdlmouse.            (line  62)
+* cursor:                                Sdlmouse.            (line  47)
+* cursor_data:                           Sdlmouse.            (line  65)
 * event:                                 Sdlevent.            (line 202)
 * event_kind:                            Sdlevent.            (line 317)
 * event_mask:                            Sdlevent.            (line 216)
-* fade_status:                           Sdlmixer.            (line 242)
+* fade_status:                           Sdlmixer.            (line 248)
 * font:                                  Sdlttf.              (line  36)
 * font_style:                            Sdlttf.              (line  55)
 * format:                                Sdlmixer.            (line  46)
-* group:                                 Sdlmixer.            (line 256)
+* group:                                 Sdlmixer.            (line 262)
 * hat_value:                             Sdljoystick.         (line 110)
 * idle_event_func:                       Sdlevent/Old.        (line  38)
 * joyaxis_event:                         Sdlevent.            (line 124)
@@ -3123,8 +3132,8 @@
 * mousebutton_event:                     Sdlevent.            (line 112)
 * mousemotion_event:                     Sdlevent.            (line  97)
 * mousemotion_event_func:                Sdlevent/Old.        (line  33)
-* music:                                 Sdlmixer.            (line 331)
-* music_kind:                            Sdlmixer.            (line 341)
+* music:                                 Sdlmixer.            (line 337)
+* music_kind:                            Sdlmixer.            (line 347)
 * palette_flag:                          Sdlvideo.            (line 359)
 * pixel_format_info:                     Sdlvideo.            (line  71)
 * rect:                                  Sdlvideo.            (line  27)
@@ -3180,9 +3189,9 @@
 * aalineRGBA:                            Sdlgfx.              (line  52)
 * active_mask:                           Sdlevent.            (line 222)
 * add:                                   Sdlevent.            (line 417)
-* all_channels:                          Sdlmixer.            (line 135)
+* all_channels:                          Sdlmixer.            (line 141)
 * all_events_mask:                       Sdlevent.            (line 298)
-* allocate_channels:                     Sdlmixer.            (line 147)
+* allocate_channels:                     Sdlmixer.            (line 153)
 * black:                                 Sdlvideo.            (line 300)
 * blit_surface:                          Sdlvideo.            (line 612)
 * blue:                                  Sdlvideo.            (line 316)
@@ -3205,7 +3214,7 @@
 * circleRGBA:                            Sdlgfx.              (line  60)
 * close:                                 Sdljoystick.         (line 166)
 * close_audio:                           Sdlmixer.            (line  73)
-* convert_to_cursor:                     Sdlmouse.            (line 127)
+* convert_to_cursor:                     Sdlmouse.            (line 130)
 * copy_rect:                             Sdlvideo.            (line  37)
 * create_RGB_surface:                    Sdlvideo.            (line 406)
 * create_RGB_surface_format:             Sdlvideo.            (line 417)
@@ -3213,10 +3222,10 @@
 * create_RGB_surface_from_24:            Sdlvideo.            (line 436)
 * create_RGB_surface_from_32:            Sdlvideo.            (line 428)
 * create_RGB_surface_from_8:             Sdlvideo.            (line 452)
-* cursor_data:                           Sdlmouse.            (line 114)
-* cursor_visible:                        Sdlmouse.            (line 102)
+* cursor_data:                           Sdlmouse.            (line 117)
+* cursor_visible:                        Sdlmouse.            (line 105)
 * cyan:                                  Sdlvideo.            (line 324)
-* default_group:                         Sdlmixer.            (line 260)
+* default_group:                         Sdlmixer.            (line 266)
 * delay:                                 Sdltimer.            (line  17)
 * disable_events:                        Sdlevent.            (line 339)
 * disable_key_repeat:                    Sdlkey.              (line 323)
@@ -3229,14 +3238,14 @@
 * enable_key_repeat:                     Sdlkey.              (line 329)
 * enable_unicode:                        Sdlkey.              (line 313)
 * exit_event_loop:                       Sdlevent/Old.        (line  75)
-* expire_channel:                        Sdlmixer.            (line 208)
-* fadein_channel:                        Sdlmixer.            (line 174)
-* fadein_music:                          Sdlmixer.            (line 366)
-* fadeout_channel:                       Sdlmixer.            (line 216)
-* fadeout_group:                         Sdlmixer.            (line 317)
-* fadeout_music:                         Sdlmixer.            (line 410)
-* fading_channel:                        Sdlmixer.            (line 248)
-* fading_music:                          Sdlmixer.            (line 433)
+* expire_channel:                        Sdlmixer.            (line 214)
+* fadein_channel:                        Sdlmixer.            (line 180)
+* fadein_music:                          Sdlmixer.            (line 372)
+* fadeout_channel:                       Sdlmixer.            (line 222)
+* fadeout_group:                         Sdlmixer.            (line 323)
+* fadeout_music:                         Sdlmixer.            (line 416)
+* fading_channel:                        Sdlmixer.            (line 254)
+* fading_music:                          Sdlmixer.            (line 439)
 * family_name:                           Sdlttf.              (line 111)
 * fill_rect:                             Sdlvideo.            (line 629)
 * filledCircleColor:                     Sdlgfx.              (line  72)
@@ -3250,9 +3259,9 @@
 * font_height:                           Sdlttf.              (line  73)
 * font_lineskip:                         Sdlttf.              (line  94)
 * frames_of_msf:                         Sdlcdrom.            (line 126)
-* free_chunk:                            Sdlmixer.            (line 123)
-* free_cursor:                           Sdlmouse.            (line  82)
-* free_music:                            Sdlmixer.            (line 353)
+* free_chunk:                            Sdlmixer.            (line 129)
+* free_cursor:                           Sdlmouse.            (line  85)
+* free_music:                            Sdlmixer.            (line 359)
 * get:                                   Sdlevent.            (line 409)
 * get_alpha:                             Sdlvideo.            (line 579)
 * get_app_state:                         Sdlevent.            (line  43)
@@ -3262,7 +3271,7 @@
 * get_caption:                           Sdlwm.               (line  23)
 * get_clip_rect:                         Sdlvideo.            (line 600)
 * get_color_key:                         Sdlvideo.            (line 562)
-* get_cursor:                            Sdlmouse.            (line  96)
+* get_cursor:                            Sdlmouse.            (line  99)
 * get_enabled_events:                    Sdlevent.            (line 346)
 * get_event_state:                       Sdljoystick.         (line 107)
 * get_font_style:                        Sdlttf.              (line  59)
@@ -3276,7 +3285,7 @@
 * get_RGB:                               Sdlvideo.            (line 384)
 * get_RGBA:                              Sdlvideo.            (line 391)
 * get_state <1>:                         Sdlevent.            (line 352)
-* get_state:                             Sdlmouse.            (line  28)
+* get_state:                             Sdlmouse.            (line  31)
 * get_ticks:                             Sdltimer.            (line  23)
 * get_video_info:                        Sdlvideo.            (line 104)
 * get_video_info_format:                 Sdlvideo.            (line 110)
@@ -3286,15 +3295,15 @@
 * glyph_metrics:                         Sdlttf.              (line 132)
 * grab_input:                            Sdlwm.               (line  54)
 * green:                                 Sdlvideo.            (line 312)
-* group_available:                       Sdlmixer.            (line 297)
-* group_channel:                         Sdlmixer.            (line 276)
-* group_channels:                        Sdlmixer.            (line 284)
-* group_count:                           Sdlmixer.            (line 290)
-* group_newer:                           Sdlmixer.            (line 310)
-* group_oldest:                          Sdlmixer.            (line 304)
-* halt_channel:                          Sdlmixer.            (line 204)
-* halt_group:                            Sdlmixer.            (line 325)
-* halt_music:                            Sdlmixer.            (line 406)
+* group_available:                       Sdlmixer.            (line 303)
+* group_channel:                         Sdlmixer.            (line 282)
+* group_channels:                        Sdlmixer.            (line 290)
+* group_count:                           Sdlmixer.            (line 296)
+* group_newer:                           Sdlmixer.            (line 316)
+* group_oldest:                          Sdlmixer.            (line 310)
+* halt_channel:                          Sdlmixer.            (line 210)
+* halt_group:                            Sdlmixer.            (line 331)
+* halt_music:                            Sdlmixer.            (line 412)
 * has_event:                             Sdlevent.            (line 394)
 * hat_centered:                          Sdljoystick.         (line 114)
 * hat_down:                              Sdljoystick.         (line 126)
@@ -3346,13 +3355,14 @@
 * load_BMP_from_mem:                     Sdlvideo.            (line 537)
 * load_image:                            Sdlloader.           (line  22)
 * load_image_from_mem:                   Sdlloader.           (line  28)
-* load_music:                            Sdlmixer.            (line 347)
+* load_music:                            Sdlmixer.            (line 353)
 * load_string:                           Sdlmixer.            (line 109)
+* load_string_raw:                       Sdlmixer.            (line 115)
 * loadWAV:                               Sdlmixer.            (line  99)
 * loadWAV_from_mem:                      Sdlmixer.            (line 105)
 * lock:                                  Sdlvideo.            (line 466)
 * magenta:                               Sdlvideo.            (line 328)
-* make_cursor:                           Sdlmouse.            (line  68)
+* make_cursor:                           Sdlmouse.            (line  71)
 * make_mask:                             Sdlevent.            (line 321)
 * map_RGB:                               Sdlvideo.            (line 377)
 * max_code:                              Sdlkey.              (line 298)
@@ -3361,29 +3371,29 @@
 * mousebuttonup_mask:                    Sdlevent.            (line 242)
 * mousemotion_mask:                      Sdlevent.            (line 234)
 * msf_of_frames:                         Sdlcdrom.            (line 122)
-* music_type:                            Sdlmixer.            (line 418)
+* music_type:                            Sdlmixer.            (line 424)
 * must_lock:                             Sdlvideo.            (line 459)
 * name <1>:                              Sdlkey.              (line 304)
 * name:                                  Sdljoystick.         (line  36)
 * num_axes:                              Sdljoystick.         (line  64)
 * num_balls:                             Sdljoystick.         (line  70)
 * num_buttons:                           Sdljoystick.         (line  84)
-* num_channels:                          Sdlmixer.            (line 141)
+* num_channels:                          Sdlmixer.            (line 147)
 * num_hats:                              Sdljoystick.         (line  78)
 * num_joysticks:                         Sdljoystick.         (line  30)
 * num_keys:                              Sdlkey.              (line 292)
-* num_paused_channel:                    Sdlmixer.            (line 236)
-* num_playing_channel:                   Sdlmixer.            (line 228)
+* num_paused_channel:                    Sdlmixer.            (line 242)
+* num_playing_channel:                   Sdlmixer.            (line 234)
 * of_mask:                               Sdlevent.            (line 325)
 * open_audio:                            Sdlmixer.            (line  59)
 * open_font:                             Sdlttf.              (line  42)
 * open_joystick:                         Sdljoystick.         (line  43)
 * opened:                                Sdljoystick.         (line  52)
 * palette_ncolors:                       Sdlvideo.            (line 341)
-* pause_channel:                         Sdlmixer.            (line 196)
-* pause_music:                           Sdlmixer.            (line 381)
-* paused_channel:                        Sdlmixer.            (line 232)
-* paused_music:                          Sdlmixer.            (line 429)
+* pause_channel:                         Sdlmixer.            (line 202)
+* pause_music:                           Sdlmixer.            (line 387)
+* paused_channel:                        Sdlmixer.            (line 238)
+* paused_music:                          Sdlmixer.            (line 435)
 * peek:                                  Sdlevent.            (line 401)
 * pixel_data:                            Sdlvideo.            (line 482)
 * pixel_data_16:                         Sdlvideo.            (line 492)
@@ -3392,13 +3402,13 @@
 * pixel_data_8:                          Sdlvideo.            (line 487)
 * pixelColor:                            Sdlgfx.              (line  12)
 * pixelRGBA:                             Sdlgfx.              (line  16)
-* play_channel:                          Sdlmixer.            (line 156)
-* play_music:                            Sdlmixer.            (line 359)
-* play_sound:                            Sdlmixer.            (line 167)
-* playing_channel:                       Sdlmixer.            (line 224)
-* playing_music:                         Sdlmixer.            (line 425)
+* play_channel:                          Sdlmixer.            (line 162)
+* play_music:                            Sdlmixer.            (line 365)
+* play_sound:                            Sdlmixer.            (line 173)
+* playing_channel:                       Sdlmixer.            (line 230)
+* playing_music:                         Sdlmixer.            (line 431)
 * poll:                                  Sdlevent.            (line 388)
-* pprint_cursor:                         Sdlmouse.            (line 120)
+* pprint_cursor:                         Sdlmouse.            (line 123)
 * pump:                                  Sdlevent.            (line 367)
 * put_pixel:                             Sdlvideo.            (line 517)
 * put_pixel_color:                       Sdlvideo.            (line 521)
@@ -3426,10 +3436,10 @@
 * render_utf8_blended:                   Sdlttf.              (line 171)
 * render_utf8_shaded:                    Sdlttf.              (line 167)
 * render_utf8_solid:                     Sdlttf.              (line 162)
-* reserve_channels:                      Sdlmixer.            (line 267)
-* resume_channel:                        Sdlmixer.            (line 200)
-* resume_music:                          Sdlmixer.            (line 385)
-* rewind_music:                          Sdlmixer.            (line 389)
+* reserve_channels:                      Sdlmixer.            (line 273)
+* resume_channel:                        Sdlmixer.            (line 206)
+* resume_music:                          Sdlmixer.            (line 391)
+* rewind_music:                          Sdlmixer.            (line 395)
 * rotozoomSurface:                       Sdlgfx.              (line 127)
 * rotozoomSurfaceXY:                     Sdlgfx.              (line 131)
 * save_BMP:                              Sdlvideo.            (line 543)
@@ -3437,7 +3447,7 @@
 * set_caption:                           Sdlwm.               (line  17)
 * set_clip_rect:                         Sdlvideo.            (line 594)
 * set_color_key:                         Sdlvideo.            (line 556)
-* set_cursor:                            Sdlmouse.            (line  88)
+* set_cursor:                            Sdlmouse.            (line  91)
 * set_event_state:                       Sdljoystick.         (line 103)
 * set_font_style:                        Sdlttf.              (line  66)
 * set_gamma:                             Sdlvideo.            (line 285)
@@ -3447,15 +3457,15 @@
 * set_mod_state:                         Sdlkey.              (line 430)
 * set_mouse_event_func:                  Sdlevent/Old.        (line  52)
 * set_mousemotion_event_func:            Sdlevent/Old.        (line  56)
-* set_music_cmd:                         Sdlmixer.            (line 393)
+* set_music_cmd:                         Sdlmixer.            (line 399)
 * set_palette:                           Sdlvideo.            (line 365)
 * set_resize_event_func:                 Sdlevent/Old.        (line  64)
 * set_state:                             Sdlevent.            (line 358)
 * set_video_mode:                        Sdlvideo.            (line 241)
-* setvolume_channel:                     Sdlmixer.            (line 188)
-* setvolume_chunk:                       Sdlmixer.            (line 119)
-* setvolume_music:                       Sdlmixer.            (line 377)
-* show_cursor:                           Sdlmouse.            (line 108)
+* setvolume_channel:                     Sdlmixer.            (line 194)
+* setvolume_chunk:                       Sdlmixer.            (line 125)
+* setvolume_music:                       Sdlmixer.            (line 383)
+* show_cursor:                           Sdlmouse.            (line 111)
 * size_text:                             Sdlttf.              (line 122)
 * size_utf8:                             Sdlttf.              (line 128)
 * start_event_loop:                      Sdlevent/Old.        (line  71)
@@ -3475,7 +3485,7 @@
 * unset_alpha:                           Sdlvideo.            (line 568)
 * unset_clip_rect:                       Sdlvideo.            (line 588)
 * unset_color_key:                       Sdlvideo.            (line 552)
-* unset_music_cmd:                       Sdlmixer.            (line 399)
+* unset_music_cmd:                       Sdlmixer.            (line 405)
 * update:                                Sdljoystick.         (line  93)
 * update_rect:                           Sdlvideo.            (line 251)
 * update_rects:                          Sdlvideo.            (line 259)
@@ -3486,12 +3496,12 @@
 * video_mode_ok:                         Sdlvideo.            (line 150)
 * videoexpose_mask:                      Sdlevent.            (line 278)
 * videoresize_mask:                      Sdlevent.            (line 274)
-* volume_channel:                        Sdlmixer.            (line 181)
-* volume_chunk:                          Sdlmixer.            (line 115)
-* volume_music:                          Sdlmixer.            (line 373)
+* volume_channel:                        Sdlmixer.            (line 187)
+* volume_chunk:                          Sdlmixer.            (line 121)
+* volume_music:                          Sdlmixer.            (line 379)
 * wait:                                  Sdlevent.            (line 381)
 * wait_event:                            Sdlevent.            (line 375)
-* warp:                                  Sdlmouse.            (line  36)
+* warp:                                  Sdlmouse.            (line  39)
 * was_init:                              Sdl.                 (line  56)
 * white:                                 Sdlvideo.            (line 304)
 * yellow:                                Sdlvideo.            (line 320)
@@ -3524,24 +3534,24 @@
 
 
 Tag Table:
-Node: Top252
-Node: Sdl985
-Node: Sdlcdrom2744
-Node: Sdltimer5860
-Node: Sdljoystick6283
-Node: Sdlkey9202
-Node: Sdlmouse15993
-Node: Sdlevent18705
-Node: Sdlevent/Old27218
-Node: Sdlvideo28793
-Node: Sdlwm42605
-Node: Sdlttf44122
-Node: Sdlloader47941
-Node: Sdlmixer48526
-Node: Sdlgfx56929
-Node: Types index60175
-Node: Exceptions index64257
-Node: Values index65070
-Node: Modules index88872
+Node: Top257
+Node: Sdl1008
+Node: Sdlcdrom2767
+Node: Sdltimer5883
+Node: Sdljoystick6306
+Node: Sdlkey9225
+Node: Sdlmouse16016
+Node: Sdlevent18863
+Node: Sdlevent/Old27376
+Node: Sdlvideo28951
+Node: Sdlwm42763
+Node: Sdlttf44280
+Node: Sdlloader48099
+Node: Sdlmixer48684
+Node: Sdlgfx57203
+Node: Types index60449
+Node: Exceptions index64531
+Node: Values index65344
+Node: Modules index89219
 
 End Tag Table
diff -Nru ocamlsdl-0.8.0/doc/ocamlsdl.texi ocamlsdl-0.9.0/doc/ocamlsdl.texi
--- ocamlsdl-0.8.0/doc/ocamlsdl.texi	2010-04-19 20:50:52.000000000 +0000
+++ ocamlsdl-0.9.0/doc/ocamlsdl.texi	2012-05-28 17:53:38.000000000 +0000
@@ -1,7 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
 @setfilename ocamlsdl.info
-@settitle OCamlSDL 
+@settitle OCamlSDL 0.9.0
 @c %**end of header
 @defcodeindex va
 @defcodeindex ty
@@ -9,16 +9,16 @@
 @defcodeindex mo
 @dircategory Objective Caml
 @direntry
-* OCamlSDL : (ocamlsdl).
+* OCamlSDL 0.9.0: (ocamlsdl).
 @end direntry
 @ifinfo
 This file was generated by Ocamldoc using the Texinfo generator.
 @end ifinfo
 @c no titlepage.
 @node Top, , , (dir)
-@top OCamlSDL 
+@top OCamlSDL 0.9.0
 @ifinfo
-Documentation for OCamlSDL 
+Documentation for OCamlSDL 0.9.0
 @end ifinfo
 @menu
 * Sdl::                            Module
@@ -1252,6 +1252,9 @@
   | BUTTON_RIGHT
   | BUTTON_WHEELUP
   | BUTTON_WHEELDOWN
+  | BUTTON_X of int     
+     (* BUTTON_X is only seen in a Sdlevent.mousebutton_event,
+        it is not returned by Sdlmouse.get_state *)
 }
 @end format
 @tyindex button
@@ -3565,6 +3568,15 @@
 
 @format
 @t{
+ @minus{} val load_string_raw :
+     string -> chunk}
+@end format
+@vaindex load_string_raw
+
+Load raw audio data of the mixer format from a memory buffer
+
+@format
+@t{
  @minus{} val volume_chunk :
      chunk -> float}
 @end format
diff -Nru ocamlsdl-0.8.0/META.in ocamlsdl-0.9.0/META.in
--- ocamlsdl-0.8.0/META.in	2010-04-19 20:52:51.000000000 +0000
+++ ocamlsdl-0.9.0/META.in	2012-05-28 17:40:01.000000000 +0000
@@ -24,7 +24,7 @@
 )
 
 package "sdlgfx" (
-  require = "sdl"
+  requires = "sdl"
   archive(byte) = "sdlgfx.cma"
   archive(native) = "sdlgfx.cmxa"
 )
diff -Nru ocamlsdl-0.8.0/NEWS ocamlsdl-0.9.0/NEWS
--- ocamlsdl-0.8.0/NEWS	2010-04-19 20:50:35.000000000 +0000
+++ ocamlsdl-0.9.0/NEWS	2012-05-28 17:49:43.000000000 +0000
@@ -1,3 +1,12 @@
+Release 0.9.0:
+        * add a variant in Sdlmouse.button for extra mouse buttons
+          (seen with mouse events in Sdlevent)
+        * ensure that the arrays returned by Sdlvideo.pixel_data keep
+          the underlying SDL_surface alive
+        * put SDL_GL_SwapBuffers in a blocking section
+        * bind the Mix_QuickLoad_RAW function (Sdlmixer.load_string_raw)
+        * fix a typo in META for Sdlgfx 
+
 Release 0.8.0:
         * add SDL_gfx bindings (Julien Boulnois)
         * add UTF8 support in Sdlttf
diff -Nru ocamlsdl-0.8.0/src/.depend ocamlsdl-0.9.0/src/.depend
--- ocamlsdl-0.8.0/src/.depend	2010-04-19 20:50:44.000000000 +0000
+++ ocamlsdl-0.9.0/src/.depend	2012-05-28 17:14:43.000000000 +0000
@@ -1,42 +1,42 @@
-sdlcdrom.cmo: sdlcdrom.cmi 
-sdlcdrom.cmx: sdlcdrom.cmi 
-sdlevent.cmo: sdlmouse.cmi sdlkey.cmi sdljoystick.cmi sdlevent.cmi 
-sdlevent.cmx: sdlmouse.cmx sdlkey.cmx sdljoystick.cmx sdlevent.cmi 
-sdlgfx.cmo: sdlvideo.cmi sdlgfx.cmi 
-sdlgfx.cmx: sdlvideo.cmx sdlgfx.cmi 
-sdlgl.cmo: sdlvideo.cmi sdlgl.cmi 
-sdlgl.cmx: sdlvideo.cmx sdlgl.cmi 
-sdljoystick.cmo: sdljoystick.cmi 
-sdljoystick.cmx: sdljoystick.cmi 
-sdlkey.cmo: sdlkey.cmi 
-sdlkey.cmx: sdlkey.cmi 
-sdlloader.cmo: sdlvideo.cmi sdl.cmi sdlloader.cmi 
-sdlloader.cmx: sdlvideo.cmx sdl.cmx sdlloader.cmi 
-sdlmixer.cmo: sdl.cmi sdlmixer.cmi 
-sdlmixer.cmx: sdl.cmx sdlmixer.cmi 
-sdl.cmo: sdl.cmi 
-sdl.cmx: sdl.cmi 
-sdlmouse.cmo: sdlmouse.cmi 
-sdlmouse.cmx: sdlmouse.cmi 
-sdltimer.cmo: sdltimer.cmi 
-sdltimer.cmx: sdltimer.cmi 
-sdlttf.cmo: sdlvideo.cmi sdlttf.cmi 
-sdlttf.cmx: sdlvideo.cmx sdlttf.cmi 
-sdlvideo.cmo: sdl.cmi sdlvideo.cmi 
-sdlvideo.cmx: sdl.cmx sdlvideo.cmi 
-sdlwm.cmo: sdlvideo.cmi sdlwm.cmi 
-sdlwm.cmx: sdlvideo.cmx sdlwm.cmi 
-sdlcdrom.cmi: 
-sdlevent.cmi: sdlmouse.cmi sdlkey.cmi 
-sdlgfx.cmi: sdlvideo.cmi 
-sdlgl.cmi: sdlvideo.cmi 
-sdljoystick.cmi: 
-sdlkey.cmi: 
-sdlloader.cmi: sdlvideo.cmi 
-sdlmixer.cmi: sdl.cmi 
-sdl.cmi: 
-sdlmouse.cmi: 
-sdltimer.cmi: 
-sdlttf.cmi: sdlvideo.cmi 
-sdlvideo.cmi: 
-sdlwm.cmi: sdlvideo.cmi 
+sdlttf.cmo: sdlvideo.cmi sdlttf.cmi
+sdlttf.cmx: sdlvideo.cmx sdlttf.cmi
+sdlgfx.cmo: sdlvideo.cmi sdlgfx.cmi
+sdlgfx.cmx: sdlvideo.cmx sdlgfx.cmi
+sdljoystick.cmo: sdljoystick.cmi
+sdljoystick.cmx: sdljoystick.cmi
+sdlgl.cmo: sdlvideo.cmi sdlgl.cmi
+sdlgl.cmx: sdlvideo.cmx sdlgl.cmi
+sdlcdrom.cmo: sdlcdrom.cmi
+sdlcdrom.cmx: sdlcdrom.cmi
+sdlwm.cmo: sdlvideo.cmi sdlwm.cmi
+sdlwm.cmx: sdlvideo.cmx sdlwm.cmi
+sdlmixer.cmo: sdl.cmi sdlmixer.cmi
+sdlmixer.cmx: sdl.cmx sdlmixer.cmi
+sdlvideo.cmo: sdl.cmi sdlvideo.cmi
+sdlvideo.cmx: sdl.cmx sdlvideo.cmi
+sdlevent.cmo: sdlmouse.cmi sdlkey.cmi sdljoystick.cmi sdlevent.cmi
+sdlevent.cmx: sdlmouse.cmx sdlkey.cmx sdljoystick.cmx sdlevent.cmi
+sdlkey.cmo: sdlkey.cmi
+sdlkey.cmx: sdlkey.cmi
+sdlloader.cmo: sdlvideo.cmi sdl.cmi sdlloader.cmi
+sdlloader.cmx: sdlvideo.cmx sdl.cmx sdlloader.cmi
+sdl.cmo: sdl.cmi
+sdl.cmx: sdl.cmi
+sdltimer.cmo: sdltimer.cmi
+sdltimer.cmx: sdltimer.cmi
+sdlmouse.cmo: sdlmouse.cmi
+sdlmouse.cmx: sdlmouse.cmi
+sdlwm.cmi: sdlvideo.cmi
+sdlkey.cmi:
+sdljoystick.cmi:
+sdlmouse.cmi:
+sdl.cmi:
+sdlevent.cmi: sdlmouse.cmi sdlkey.cmi
+sdlgfx.cmi: sdlvideo.cmi
+sdlcdrom.cmi:
+sdlmixer.cmi: sdl.cmi
+sdlvideo.cmi:
+sdlttf.cmi: sdlvideo.cmi
+sdlloader.cmi: sdlvideo.cmi
+sdlgl.cmi: sdlvideo.cmi
+sdltimer.cmi:
diff -Nru ocamlsdl-0.8.0/src/.depend_c ocamlsdl-0.9.0/src/.depend_c
--- ocamlsdl-0.8.0/src/.depend_c	2010-04-19 20:50:44.000000000 +0000
+++ ocamlsdl-0.9.0/src/.depend_c	2012-05-28 17:14:43.000000000 +0000
@@ -1,21 +1,21 @@
-common.o: common.c common.h config.h
-mlsdl_main.o: mlsdl_main.c
-sdlcdrom_stub.o: sdlcdrom_stub.c common.h config.h
+sdl_stub.o: sdl_stub.c common.h config.h sdlinit_flag.h sdlinit_flag.c
+sdlrwops_stub.o: sdlrwops_stub.c common.h config.h sdlrwops_stub.h
+sdlwm_stub.o: sdlwm_stub.c common.h config.h sdlvideo_stub.h
+sdltimer_stub.o: sdltimer_stub.c common.h config.h
+sdlmouse_stub.o: sdlmouse_stub.c common.h config.h sdlmouse_stub.h
 sdlevent_stub.o: sdlevent_stub.c common.h config.h sdlmouse_stub.h
-sdlgfx_stub.o: sdlgfx_stub.c common.h config.h sdlvideo_stub.h
 sdlgl_stub.o: sdlgl_stub.c common.h config.h sdlvideo_stub.h
-sdlinit_flag.o: sdlinit_flag.c
+common.o: common.c common.h config.h
 sdljoystick_stub.o: sdljoystick_stub.c common.h config.h
-sdlkey_stub.o: sdlkey_stub.c common.h config.h
-sdlloader_stub.o: sdlloader_stub.c common.h config.h sdlvideo_stub.h \
- sdlrwops_stub.h
-sdlmixer_stub.o: sdlmixer_stub.c common.h config.h sdlrwops_stub.h
-sdlmouse_stub.o: sdlmouse_stub.c common.h config.h sdlmouse_stub.h
-sdlrwops_stub.o: sdlrwops_stub.c common.h config.h sdlrwops_stub.h
-sdl_stub.o: sdl_stub.c common.h config.h sdlinit_flag.h sdlinit_flag.c
-sdltimer_stub.o: sdltimer_stub.c common.h config.h
 sdlttf_stub.o: sdlttf_stub.c common.h config.h sdlvideo_stub.h
+mlsdl_main.o: mlsdl_main.c
 sdlvideo_flag.o: sdlvideo_flag.c
+sdlinit_flag.o: sdlinit_flag.c
+sdlkey_stub.o: sdlkey_stub.c common.h config.h
+sdlcdrom_stub.o: sdlcdrom_stub.c common.h config.h
+sdlmixer_stub.o: sdlmixer_stub.c common.h config.h sdlrwops_stub.h
 sdlvideo_stub.o: sdlvideo_stub.c common.h config.h sdlvideo_stub.h \
  sdlrwops_stub.h sdlvideo_flag.h sdlvideo_flag.c
-sdlwm_stub.o: sdlwm_stub.c common.h config.h sdlvideo_stub.h
+sdlgfx_stub.o: sdlgfx_stub.c common.h config.h sdlvideo_stub.h
+sdlloader_stub.o: sdlloader_stub.c common.h config.h sdlvideo_stub.h \
+ sdlrwops_stub.h
diff -Nru ocamlsdl-0.8.0/src/sdlevent_stub.c ocamlsdl-0.9.0/src/sdlevent_stub.c
--- ocamlsdl-0.8.0/src/sdlevent_stub.c	2010-04-19 20:43:33.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlevent_stub.c	2011-04-10 15:33:52.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: sdlevent_stub.c,v 1.23 2010/04/19 20:43:33 oliv__a Exp $ */
+/* $Id: sdlevent_stub.c,v 1.24 2011/04/10 15:33:52 oliv__a Exp $ */
 
 #include <SDL.h>
 
@@ -97,8 +97,7 @@
   tag_t tag;
   r = alloc_small(6, 0);
   Field(r, 0) = Val_int(keyevt.which) ;
-  Field(r, 1) = Val_int(keyevt.state) ; 
-  /* SDL_PRESSED = 0x01, SDL_RELEASED = 0x00 */
+  Field(r, 1) = keyevt.state == SDL_RELEASED ? Val_int(0) : Val_int(1);
   Field(r, 2) = find_mlsdl_keysym(keyevt.keysym.sym) ;
   Field(r, 3) = Val_int(keyevt.keysym.mod) ;
   if (SDL_EnableUNICODE(-1) && keyevt.keysym.unicode <= 0xFF)
@@ -111,6 +110,18 @@
   CAMLreturn(v);
 } 
 
+static value value_of_mouse_button(Uint8 b)
+{
+  value r;
+  if (SDL_BUTTON_LEFT <= b && b <= SDL_BUTTON_WHEELDOWN)
+    r = Val_int(b);
+  else {
+    r = caml_alloc_small(1, 0);
+    Field(r, 0) = Val_int(b);
+  }
+  return r;
+}
+
 static value value_of_SDLEvent(SDL_Event evt)
 {
   CAMLparam0();
@@ -143,10 +154,11 @@
     break ;
   case SDL_MOUSEBUTTONDOWN :
   case SDL_MOUSEBUTTONUP :
+    t = value_of_mouse_button(evt.button.button);
     r = alloc_small(5, 0);
     Field(r, 0) = Val_int(evt.button.which);
-    Field(r, 1) = Val_int(evt.button.button - 1);
-    Field(r, 2) = Val_int(evt.button.state);
+    Field(r, 1) = t;
+    Field(r, 2) = evt.button.state == SDL_RELEASED ? Val_int(0) : Val_int(1);
     Field(r, 3) = Val_int(evt.button.x);
     Field(r, 4) = Val_int(evt.button.y);
     tag = evt.button.state == SDL_PRESSED ? 4 : 5;
@@ -183,7 +195,7 @@
     r = alloc_small(3, 0);
     Field(r, 0) = Val_int(evt.jbutton.which);
     Field(r, 1) = Val_int(evt.jbutton.button);
-    Field(r, 2) = Val_int(evt.jbutton.state);
+    Field(r, 2) = evt.jbutton.state == SDL_RELEASED ? Val_int(0) : Val_int(1);
     tag = evt.jbutton.state == SDL_PRESSED ? 9 : 10 ;
     v = alloc_small(1, tag);
     Field(v, 0) = r;
@@ -258,7 +270,7 @@
     case 5:
       evt.type = Tag_val(e) == 4 ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP ;
       evt.button.which  = Int_val(Field(r, 0));
-      evt.button.button = Int_val(Field(r, 1));
+      evt.button.button = Is_long(Field(r, 1)) ? Int_val(Field(r, 1)) : Int_val(Field(Field(r, 1), 0));
       evt.button.state  = Int_val(Field(r, 2));
       evt.button.x      = Int_val(Field(r, 3));
       evt.button.y      = Int_val(Field(r, 4));
diff -Nru ocamlsdl-0.8.0/src/sdlgl_stub.c ocamlsdl-0.9.0/src/sdlgl_stub.c
--- ocamlsdl-0.8.0/src/sdlgl_stub.c	2010-04-19 19:46:50.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlgl_stub.c	2011-04-10 12:42:10.000000000 +0000
@@ -8,7 +8,13 @@
  * GL interaction functions
  */
 
-ML_0(SDL_GL_SwapBuffers, Unit)
+CAMLprim value ml_SDL_GL_SwapBuffers(value unit)
+{
+  enter_blocking_section();
+  SDL_GL_SwapBuffers();
+  leave_blocking_section();
+  return Val_unit;
+}
 
 static const SDL_GLattr GL_attr_map[] = {
   SDL_GL_RED_SIZE, SDL_GL_GREEN_SIZE,
diff -Nru ocamlsdl-0.8.0/src/sdlmixer.ml ocamlsdl-0.9.0/src/sdlmixer.ml
--- ocamlsdl-0.8.0/src/sdlmixer.ml	2003-02-24 22:55:10.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlmixer.ml	2011-04-10 12:44:12.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-(* $Id: sdlmixer.ml,v 1.12 2003/02/24 22:55:10 oliv__a Exp $ *)
+(* $Id: sdlmixer.ml,v 1.13 2011/04/10 12:44:12 oliv__a Exp $ *)
 
 (* Define a new exception for loader errors and register 
    it to be callable from C code. *)
@@ -79,6 +79,7 @@
   loadWAV_RW (Sdl.rwops_from_mem buff)
 
 external load_string : string -> chunk = "sdlmixer_load_string"
+external load_string_raw : string -> chunk = "sdlmixer_load_string_raw"
 external load_music : string -> music = "sdlmixer_loadMUS"
 external music_type : music option -> music_kind = "sdlmixer_get_music_type"
 external set_music_cmd : string -> unit = "sdlmixer_set_music_cmd"
diff -Nru ocamlsdl-0.8.0/src/sdlmixer.mli ocamlsdl-0.9.0/src/sdlmixer.mli
--- ocamlsdl-0.8.0/src/sdlmixer.mli	2003-02-24 22:55:10.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlmixer.mli	2011-04-10 12:44:12.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-(* $Id: sdlmixer.mli,v 1.14 2003/02/24 22:55:10 oliv__a Exp $ *)
+(* $Id: sdlmixer.mli,v 1.15 2011/04/10 12:44:12 oliv__a Exp $ *)
 
 (** Simple multi-channel audio mixer *)
 
@@ -78,6 +78,8 @@
 
 external load_string : string -> chunk = "sdlmixer_load_string"
 (** Load a wave file of the mixer format from a memory buffer *)
+external load_string_raw : string -> chunk = "sdlmixer_load_string_raw"
+(** Load raw audio data of the mixer format from a memory buffer *)
 
 external volume_chunk   : chunk -> float = "sdlmixer_volume_chunk"
 external setvolume_chunk : chunk -> float -> unit = "sdlmixer_setvolume_chunk"
diff -Nru ocamlsdl-0.8.0/src/sdlmixer_stub.c ocamlsdl-0.9.0/src/sdlmixer_stub.c
--- ocamlsdl-0.8.0/src/sdlmixer_stub.c	2010-04-19 20:26:20.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlmixer_stub.c	2011-04-10 12:44:12.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: sdlmixer_stub.c,v 1.36 2010/04/19 20:26:20 oliv__a Exp $ */
+/* $Id: sdlmixer_stub.c,v 1.37 2011/04/10 12:44:12 oliv__a Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -204,6 +204,20 @@
   return ML_CHUNK(chunk);
 }
 
+CAMLprim value
+sdlmixer_load_string_raw(value data)
+{
+  Mix_Chunk *chunk;
+#if (MIX_MAJOR_VERSION >= 1) && (MIX_MINOR_VERSION >= 2) && (MIX_PATCHLEVEL >= 4)
+  chunk = Mix_QuickLoad_RAW(UString_val(data), caml_string_length(data));
+  if (chunk == NULL)
+    sdlmixer_raise_exception(Mix_GetError());
+#else
+  caml_failwith("Mix_QuickLoad_RAW: not supported")
+#endif
+  return ML_CHUNK(chunk);
+}
+
 
 CAMLprim value
 sdlmixer_get_music_type(value music)
diff -Nru ocamlsdl-0.8.0/src/sdlmouse.ml ocamlsdl-0.9.0/src/sdlmouse.ml
--- ocamlsdl-0.8.0/src/sdlmouse.ml	2003-03-25 15:49:48.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlmouse.ml	2011-04-10 15:33:52.000000000 +0000
@@ -6,6 +6,7 @@
   | BUTTON_RIGHT
   | BUTTON_WHEELUP
   | BUTTON_WHEELDOWN
+  | BUTTON_X of int
 
 external get_state : ?relative:bool -> unit -> int * int * button list
     = "mlsdlevent_get_mouse_state"
diff -Nru ocamlsdl-0.8.0/src/sdlmouse.mli ocamlsdl-0.9.0/src/sdlmouse.mli
--- ocamlsdl-0.8.0/src/sdlmouse.mli	2003-03-25 15:49:48.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlmouse.mli	2011-04-10 15:33:52.000000000 +0000
@@ -8,6 +8,8 @@
   | BUTTON_RIGHT
   | BUTTON_WHEELUP
   | BUTTON_WHEELDOWN
+  | BUTTON_X of int (** BUTTON_X is only seen in a Sdlevent.mousebutton_event,
+                        it is not returned by Sdlmouse.get_state *)
 
 external get_state : ?relative:bool -> unit -> int * int * button list
     = "mlsdlevent_get_mouse_state"
diff -Nru ocamlsdl-0.8.0/src/sdlvideo.ml ocamlsdl-0.9.0/src/sdlvideo.ml
--- ocamlsdl-0.8.0/src/sdlvideo.ml	2003-02-24 23:06:59.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlvideo.ml	2011-04-10 15:32:46.000000000 +0000
@@ -257,8 +257,16 @@
     = "ml_SDL_DisplayFormat"
 
 
-external _pixel_data : surface -> int -> ('a, 'b, c_layout) Array1.t
+external __pixel_data : surface -> int -> ('a, 'b, c_layout) Array1.t
     = "ml_bigarray_pixels"
+let _pixel_data_final s ba =
+  (* nothing to do, but this ensures
+     that s is kept alive until ba is collected) *)
+  ()
+let _pixel_data surf bpp =
+  let ba = __pixel_data surf bpp in
+  Gc.finalise (_pixel_data_final surf) ba ;
+  ba
 
 let pixel_data s =
   (_pixel_data s 0 : (int, int8_unsigned_elt, c_layout) Array1.t)
diff -Nru ocamlsdl-0.8.0/src/sdlvideo_stub.c ocamlsdl-0.9.0/src/sdlvideo_stub.c
--- ocamlsdl-0.8.0/src/sdlvideo_stub.c	2010-04-19 19:48:21.000000000 +0000
+++ ocamlsdl-0.9.0/src/sdlvideo_stub.c	2011-05-08 12:25:05.000000000 +0000
@@ -257,7 +257,7 @@
   else
     c_flags = Int_val(Unopt(flags)) +1 ;
 
-  status = SDL_SetPalette(s, c_flags, color, ofirstcolor, n);
+  status = SDL_SetPalette(s, c_flags, color, firstcolor, n);
   return Val_bool(status);
 }