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