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