mxe-octave: src/of-windows-1-fixes.patch annotate

annotate src/of-windows-1-fixes.patch @ 3905:f1fa61828986

of-windows: enable cross compile * src/of-windows-1-fixes.patch: new file * src/of-windows.mk: enable compile * dist-files.mk: add of-windows-1-fixes.patch

author	John Donoghue <john.donoghue@ieee.org>
date	Tue, 14 Apr 2015 22:51:09 -0400
parents
children	02a0022a6f75

rev	line source
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	1 diff -ur Windows.orig/src/configure Windows/src/configure
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	2 --- Windows.orig/src/configure 2015-04-14 22:06:35.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	3 +++ Windows/src/configure 2015-04-14 22:14:41.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	4 @@ -1,11 +1,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	5 #! /bin/sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	6 # Guess values for system-dependent variables and create Makefiles.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	7 -# Generated by GNU Autoconf 2.68.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	8 +# Generated by GNU Autoconf 2.69.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	9 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	10 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	11 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	12 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	13 -# Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	14 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	15 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	16 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	17 # This configure script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	18 @@ -134,6 +132,31 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	19 # CDPATH.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	20 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	21
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	22 +# Use a proper internal environment variable to ensure we don't fall
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	23 + # into an infinite loop, continuously re-executing ourselves.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	24 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	25 + _as_can_reexec=no; export _as_can_reexec;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	26 + # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	27 +# neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	28 +# works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	29 +# Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	30 +BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	31 +ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	32 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	33 +case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	34 + vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	35 + v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	36 + x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	37 + * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	38 +esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	39 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	40 +# Admittedly, this is quite paranoid, since all the known shells bail
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	41 +# out after a failed `exec'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	42 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	43 +as_fn_exit 255
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	44 + fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	45 + # We don't want this to propagate to other subprocesses.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	46 + { _as_can_reexec=; unset _as_can_reexec;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	47 if test "x$CONFIG_SHELL" = x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	48 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	49 emulate sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	50 @@ -167,7 +190,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	51 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	52 exitcode=1; echo positional parameters were not saved.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	53 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	54 -test x\$exitcode = x0 \|\| exit 1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	55 +test x\$exitcode = x0 \|\| exit 1
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	56 +test -x / \|\| exit 1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	57 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	58 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	59 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	60 @@ -211,21 +235,25 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	61
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	62
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	63 if test "x$CONFIG_SHELL" != x; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	64 - # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	65 - # neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	66 - # works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	67 - # Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	68 - BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	69 - ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	70 - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	71 - export CONFIG_SHELL
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	72 - case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	73 - vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	74 - v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	75 - x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	76 - * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	77 - esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	78 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	79 + export CONFIG_SHELL
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	80 + # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	81 +# neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	82 +# works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	83 +# Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	84 +BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	85 +ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	86 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	87 +case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	88 + vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	89 + v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	90 + x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	91 + * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	92 +esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	93 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	94 +# Admittedly, this is quite paranoid, since all the known shells bail
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	95 +# out after a failed `exec'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	96 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	97 +exit 255
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	98 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	99
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	100 if test x$as_have_required = xno; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	101 @@ -327,6 +355,14 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	102
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	103
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	104 } # as_fn_mkdir_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	105 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	106 +# as_fn_executable_p FILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	107 +# -----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	108 +# Test if FILE is an executable regular file.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	109 +as_fn_executable_p ()
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	110 +{
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	111 + test -f "$1" && test -x "$1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	112 +} # as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	113 # as_fn_append VAR VALUE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	114 # ----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	115 # Append the text in VALUE to the end of the definition contained in VAR. Take
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	116 @@ -448,6 +484,10 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	117 chmod +x "$as_me.lineno" \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	118 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	119
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	120 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	121 + # already done that, so ensure we don't try to do so again and fall
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	122 + # in an infinite loop. This has already happened in practice.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	123 + _as_can_reexec=no; export _as_can_reexec
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	124 # Don't try to exec as it changes $[0], causing all sort of problems
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	125 # (the dirname of $[0] is not the place where we might find the
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	126 # original and so on. Autoconf is especially sensitive to this).
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	127 @@ -482,16 +522,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	128 # ... but there are two gotchas:
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	129 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	130 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	131 - # In both cases, we have to default to `cp -p'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	132 + # In both cases, we have to default to `cp -pR'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	133 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	134 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	135 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	136 elif ln conf$$.file conf$$ 2>/dev/null; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	137 as_ln_s=ln
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	138 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	139 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	140 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	141 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	142 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	143 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	144 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	145 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	146 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	147 rmdir conf$$.dir 2>/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	148 @@ -503,28 +543,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	149 as_mkdir_p=false
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	150 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	151
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	152 -if test -x / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	153 - as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	154 -else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	155 - if ls -dL / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	156 - as_ls_L_option=L
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	157 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	158 - as_ls_L_option=
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	159 - fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	160 - as_test_x='
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	161 - eval sh -c '\''
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	162 - if test -d "$1"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	163 - test -d "$1/.";
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	164 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	165 - case $1 in #(
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	166 - -*)set "./$1";;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	167 - esac;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	168 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	169 - ???[sx]):;;)false;;esac;fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	170 - '\'' sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	171 - '
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	172 -fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	173 -as_executable_p=$as_test_x
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	174 +as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	175 +as_executable_p=as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	176
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	177 # Sed expression to map a string onto a valid CPP name.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	178 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	179 @@ -587,6 +607,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	180 mpath
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	181 subver
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	182 ver
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	183 +OCTAVE_CONFIG
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	184 MKOCTFILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	185 OBJEXT
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	186 EXEEXT
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	187 @@ -1110,8 +1131,6 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	188 if test "x$host_alias" != x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	189 if test "x$build_alias" = x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	190 cross_compiling=maybe
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	191 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	192 - If a cross compiler is detected then cross compile mode will be used" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	193 elif test "x$build_alias" != "x$host_alias"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	194 cross_compiling=yes
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	195 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	196 @@ -1347,9 +1366,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	197 if $ac_init_version; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	198 cat <<\_ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	199 configure
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	200 -generated by GNU Autoconf 2.68
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	201 +generated by GNU Autoconf 2.69
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	202
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	203 -Copyright (C) 2010 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	204 +Copyright (C) 2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	205 This configure script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	206 gives unlimited permission to copy, distribute and modify it.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	207 _ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	208 @@ -1402,7 +1421,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	209 running configure, to aid debugging if configure makes a mistake.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	210
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	211 It was created by $as_me, which was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	212 -generated by GNU Autoconf 2.68. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	213 +generated by GNU Autoconf 2.69. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	214
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	215 $ $0 $@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	216
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	217 @@ -1787,7 +1806,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	218 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	219 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	220 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	221 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	222 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	223 ac_cv_prog_CC="${ac_tool_prefix}gcc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	224 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	225 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	226 @@ -1827,7 +1846,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	227 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	228 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	229 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	230 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	231 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	232 ac_cv_prog_ac_ct_CC="gcc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	233 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	234 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	235 @@ -1880,7 +1899,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	236 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	237 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	238 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	239 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	240 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	241 ac_cv_prog_CC="${ac_tool_prefix}cc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	242 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	243 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	244 @@ -1921,7 +1940,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	245 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	246 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	247 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	248 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	249 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	250 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	251 ac_prog_rejected=yes
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	252 continue
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	253 @@ -1979,7 +1998,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	254 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	255 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	256 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	257 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	258 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	259 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	260 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	261 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	262 @@ -2023,7 +2042,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	263 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	264 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	265 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	266 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	267 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	268 ac_cv_prog_ac_ct_CC="$ac_prog"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	269 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	270 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	271 @@ -2469,8 +2488,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	272 /* end confdefs.h. */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	273 #include <stdarg.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	274 #include <stdio.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	275 -#include <sys/types.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	276 -#include <sys/stat.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	277 +struct stat;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	278 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	279 struct buf { int x; };
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	280 FILE * (rcsopen) (struct buf , struct stat *, int);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	281 @@ -2575,7 +2593,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	282 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	283 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	284 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	285 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	286 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	287 ac_cv_prog_MKOCTFILE="mkoctfile"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	288 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	289 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	290 @@ -2598,6 +2616,45 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	291
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	292 test -z "$MKOCTFILE" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	293 $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	294 +# Extract the first word of "octave-config", so it can be a program name with args.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	295 +set dummy octave-config; ac_word=$2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	296 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	297 +$as_echo_n "checking for $ac_word... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	298 +if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	299 + $as_echo_n "(cached) " >&6
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	300 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	301 + if test -n "$OCTAVE_CONFIG"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	302 + ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	303 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	304 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	305 +for as_dir in $PATH
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	306 +do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	307 + IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	308 + test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	309 + for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	310 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	311 + ac_cv_prog_OCTAVE_CONFIG="octave-config"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	312 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	313 + break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	314 + fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	315 +done
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	316 + done
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	317 +IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	318 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	319 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	320 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	321 +OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	322 +if test -n "$OCTAVE_CONFIG"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	323 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	324 +$as_echo "$OCTAVE_CONFIG" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	325 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	326 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	327 +$as_echo "no" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	328 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	329 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	330 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	331 +test -z "$OCTAVE_CONFIG" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	332 +$as_echo "$as_me: WARNING: no octave-config found on path" >&2;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	333
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	334
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	335
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	336 @@ -2777,6 +2834,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	337
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	338
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	339
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	340 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	341 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	342 # Extract the first word of "octave", so it can be a program name with args.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	343 set dummy octave; ac_word=$2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	344 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	345 @@ -2793,7 +2852,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	346 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	347 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	348 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	349 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	350 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	351 ac_cv_prog_OCTAVE="octave"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	352 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	353 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	354 @@ -2814,25 +2873,25 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	355 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	356
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	357
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	358 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	359 -$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	360 -OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	361 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	362 +$as_echo_n "checking for VERSION in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	363 +OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	364 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	365 $as_echo "$OCTAVE_VERSION" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	366
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	367
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	368
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	369 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	370 -$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	371 -canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	372 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	373 +$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	374 +canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	375 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	376 $as_echo "$canonical_host_type" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	377
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	378
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	379
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	380 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	381 -$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	382 -SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	383 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	384 +$as_echo_n "checking for SHLEXT in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	385 +SHLEXT=`$OCTAVE_CONFIG -p SHLEXT`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	386 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	387 $as_echo "$SHLEXT" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	388
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	389 @@ -2867,7 +2926,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	390 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	391 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	392 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	393 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	394 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	395 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	396 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	397 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	398 @@ -2907,7 +2966,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	399 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	400 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	401 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	402 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	403 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	404 ac_cv_prog_ac_ct_RANLIB="ranlib"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	406 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	407 @@ -2968,7 +3027,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	408 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	409 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	410 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	411 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	412 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	413 ac_cv_prog_STRIP="$STRIP"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	415 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	416 @@ -3020,7 +3079,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	417
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	418 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	419 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	420 - mkoctfile: $MKOCTFILE for Octave $subver"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	421 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	422 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	423 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	424
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	425
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	426 @@ -3382,16 +3442,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	427 # ... but there are two gotchas:
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	428 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	429 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	430 - # In both cases, we have to default to `cp -p'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	431 + # In both cases, we have to default to `cp -pR'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	432 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	433 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	434 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	435 elif ln conf$$.file conf$$ 2>/dev/null; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	436 as_ln_s=ln
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	437 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	438 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	439 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	440 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	441 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	442 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	443 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	444 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	445 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	446 rmdir conf$$.dir 2>/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	447 @@ -3451,28 +3511,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	448 as_mkdir_p=false
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	449 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	450
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	451 -if test -x / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	452 - as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	453 -else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	454 - if ls -dL / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	455 - as_ls_L_option=L
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	456 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	457 - as_ls_L_option=
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	458 - fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	459 - as_test_x='
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	460 - eval sh -c '\''
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	461 - if test -d "$1"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	462 - test -d "$1/.";
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	463 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	464 - case $1 in #(
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	465 - -*)set "./$1";;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	466 - esac;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	467 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	468 - ???[sx]):;;)false;;esac;fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	469 - '\'' sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	470 - '
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	471 -fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	472 -as_executable_p=$as_test_x
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	473 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	474 +# as_fn_executable_p FILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	475 +# -----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	476 +# Test if FILE is an executable regular file.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	477 +as_fn_executable_p ()
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	478 +{
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	479 + test -f "$1" && test -x "$1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	480 +} # as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	481 +as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	482 +as_executable_p=as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	483
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	484 # Sed expression to map a string onto a valid CPP name.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	485 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	486 @@ -3494,7 +3542,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	487 # values after options handling.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	488 ac_log="
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	489 This file was extended by $as_me, which was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	490 -generated by GNU Autoconf 2.68. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	491 +generated by GNU Autoconf 2.69. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	492
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	493 CONFIG_FILES = $CONFIG_FILES
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	494 CONFIG_HEADERS = $CONFIG_HEADERS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	495 @@ -3547,10 +3595,10 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	496 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	497 ac_cs_version="\\
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	498 config.status
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	499 -configured by $0, generated by GNU Autoconf 2.68,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	500 +configured by $0, generated by GNU Autoconf 2.69,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	501 with options \\"\$ac_cs_config\\"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	502
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	503 -Copyright (C) 2010 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	504 +Copyright (C) 2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	505 This config.status script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	506 gives unlimited permission to copy, distribute and modify it."
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	507
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	508 @@ -3627,7 +3675,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	509 _ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	510 cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	511 if \$ac_cs_recheck; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	512 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	513 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	514 shift
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	515 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	516 CONFIG_SHELL='$SHELL'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	517 diff -ur Windows.orig/src/configure.base Windows/src/configure.base
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	518 --- Windows.orig/src/configure.base 2015-04-14 22:06:35.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	519 +++ Windows/src/configure.base 2015-04-14 22:13:09.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	520 @@ -49,6 +49,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	521 dnl Check for mkoctfile
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	522 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	523 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	524 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	525 +test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	526
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	527 AC_SUBST(ver)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	528 AC_SUBST(subver)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	529 @@ -257,15 +259,22 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	530 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	531 ])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	532
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	533 +AC_DEFUN(OCTAVE_CONFIG_EVAL,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	534 +[AC_MSG_CHECKING([for $1 in octave-config])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	535 +$2=`$OCTAVE_CONFIG -p $1`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	536 +AC_MSG_RESULT($$2)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	537 +AC_SUBST($2)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	538 +])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	539 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	540 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	541 AC_CHECK_PROG(OCTAVE,octave,octave)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	542 -OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	543 +OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	544
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	545 dnl grab canonical host type so we can write system specific install stuff
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	546 -OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	547 +OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	548
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	549 dnl grab SHLEXT from octave config
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	550 -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	551 +OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	552
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	553 AC_PROG_LN_S
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	554
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	555 @@ -351,4 +360,5 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	556
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	557 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	558 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	559 - mkoctfile: $MKOCTFILE for Octave $subver"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	560 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	561 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	562 diff -ur Windows.orig/src/Makeconf.in Windows/src/Makeconf.in
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	563 --- Windows.orig/src/Makeconf.in 2015-04-14 22:06:35.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	564 +++ Windows/src/Makeconf.in 2015-04-14 22:13:40.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	565 @@ -52,6 +52,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	566 OCTAVE = @OCTAVE@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	567 OCTAVE_VERSION = @OCTAVE_VERSION@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	568 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	569 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	570 SHLEXT = @SHLEXT@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	571
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	572 ver = @ver@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	573 diff -ur Windows.orig/src/configure Windows/src/configure
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	574 --- Windows.orig/src/configure 2015-04-14 22:26:36.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	575 +++ Windows/src/configure 2015-04-14 22:27:10.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	576 @@ -3080,7 +3080,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	577 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	578 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	579 mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	580 - octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	581 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	582 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	583
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	584
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	585 diff -ur Windows.orig/src/configure.base Windows/src/configure.base
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	586 --- Windows.orig/src/configure.base 2015-04-14 22:26:36.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	587 +++ Windows/src/configure.base 2015-04-14 22:26:57.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	588 @@ -361,4 +361,4 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	589 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	590 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	591 mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	592 - octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	593 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	594 diff -ru Windows.orig/src/grab.cc Windows/src/grab.cc
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	595 --- Windows.orig/src/grab.cc 2015-04-14 22:28:16.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	596 +++ Windows/src/grab.cc 2015-04-14 22:31:44.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	597 @@ -123,8 +123,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	598
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	599
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	600 /* Wait for a click */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	601 - MArray<int> xc(maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	602 - MArray<int> yc(maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	603 + MArray<int> xc(dim_vector(maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	604 + MArray<int> yc(dim_vector(maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	605
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	606 int nb_elements = 0;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	607 while (1) {
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	608 @@ -142,8 +142,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	609 else break;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	610
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	611 if (nb_elements == xc.length()) {
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	612 - xc.resize (xc.length()+maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	613 - yc.resize (yc.length()+maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	614 + xc.resize (dim_vector(xc.length()+maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	615 + yc.resize (dim_vector(yc.length()+maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	616 }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	617 }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	618
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	619 diff -ur Windows.orig/src/__COM__.cc Windows/src/__COM__.cc
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	620 --- Windows.orig/src/__COM__.cc 2015-04-14 22:44:19.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	621 +++ Windows/src/__COM__.cc 2015-04-14 22:45:12.000000000 -0400
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	622 @@ -180,7 +180,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	623
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	624 private:
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	625 // regular octave value declarations
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	626 + #if defined (DEFINE_OCTAVE_ALLOCATOR)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	627 DECLARE_OCTAVE_ALLOCATOR
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	628 + #endif
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	629
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	630 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	631
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	632 @@ -189,7 +191,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	633 std::string com_typename;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	634 };
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	635
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	636 +#if defined (DEFINE_OCTAVE_ALLOCATOR)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	637 DEFINE_OCTAVE_ALLOCATOR (octave_com_object);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	638 +#endif
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	639
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	640 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_com_object,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	641 "octave_com_object",

Mercurial > mxe-octave

annotate src/of-windows-1-fixes.patch @ 3905:f1fa61828986