|
4423
|
1 diff -ur linear-algebra.orig/src/configure linear-algebra/src/configure |
|
|
2 --- linear-algebra.orig/src/configure 2017-07-13 15:57:44.643245981 -0400 |
|
|
3 +++ linear-algebra/src/configure 2017-07-13 16:02:41.757621133 -0400 |
|
|
4 @@ -599,13 +599,9 @@ |
|
|
5 FFLAGS |
|
|
6 F77 |
|
|
7 CPICFLAG |
|
|
8 -altopath |
|
|
9 -altmpath |
|
|
10 -altpath |
|
|
11 xpath |
|
|
12 opath |
|
|
13 mpath |
|
|
14 -subver |
|
|
15 ver |
|
|
16 OCTAVE_CONFIG |
|
|
17 MKOCTFILE |
|
|
18 @@ -664,9 +660,6 @@ |
|
|
19 with_mpath |
|
|
20 with_opath |
|
|
21 with_xpath |
|
|
22 -with_altpath |
|
|
23 -with_altmpath |
|
|
24 -with_altopath |
|
|
25 ' |
|
|
26 ac_precious_vars='build_alias |
|
|
27 host_alias |
|
|
28 @@ -1286,9 +1279,6 @@ |
|
|
29 --with-mpath override path for m-files |
|
|
30 --with-opath override path for oct-files |
|
|
31 --with-xpath override path for executables |
|
|
32 - --with-altpath alternative functions install path prefix |
|
|
33 - --with-altmpath override path for alternative m-files |
|
|
34 - --with-altopath override path for alternative oct-files |
|
|
35 |
|
|
36 Some influential environment variables: |
|
|
37 CC C compiler command |
|
|
38 @@ -2662,10 +2652,6 @@ |
|
|
39 |
|
|
40 |
|
|
41 |
|
|
42 - |
|
|
43 - |
|
|
44 - |
|
|
45 - |
|
|
46 # Check whether --with-path was given. |
|
|
47 if test "${with_path+set}" = set; then : |
|
|
48 withval=$with_path; path=$withval |
|
|
49 @@ -2690,86 +2676,10 @@ |
|
|
50 fi |
|
|
51 |
|
|
52 |
|
|
53 -# Check whether --with-altpath was given. |
|
|
54 -if test "${with_altpath+set}" = set; then : |
|
|
55 - withval=$with_altpath; altpath=$withval |
|
|
56 -fi |
|
|
57 - |
|
|
58 - |
|
|
59 -# Check whether --with-altmpath was given. |
|
|
60 -if test "${with_altmpath+set}" = set; then : |
|
|
61 - withval=$with_altmpath; altmpath=$withval |
|
|
62 -fi |
|
|
63 - |
|
|
64 - |
|
|
65 -# Check whether --with-altopath was given. |
|
|
66 -if test "${with_altopath+set}" = set; then : |
|
|
67 - withval=$with_altopath; altopath=$withval |
|
|
68 -fi |
|
|
69 - |
|
|
70 - |
|
|
71 if test -n "$path" ; then |
|
|
72 test -z "$mpath" && mpath=$path |
|
|
73 test -z "$opath" && opath=$path/oct |
|
|
74 test -z "$xpath" && xpath=$path/bin |
|
|
75 - test -z "$altpath" && altpath=$path-alternatives |
|
|
76 -fi |
|
|
77 - |
|
|
78 -if test -n "$altpath" ; then |
|
|
79 - test -z "$altmpath" && altmpath=$altpath |
|
|
80 - test -z "$altopath" && altopath=$altpath/oct |
|
|
81 -fi |
|
|
82 - |
|
|
83 -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then |
|
|
84 -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then |
|
|
85 - cat > conftest.cc <<EOF |
|
|
86 -#include <octave/config.h> |
|
|
87 -#include <octave/version.h> |
|
|
88 -#include <octave/defaults.h> |
|
|
89 - |
|
|
90 -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" |
|
|
91 - |
|
|
92 -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" |
|
|
93 - |
|
|
94 -#ifdef OCTAVE_LOCALVERFCNFILEDIR |
|
|
95 -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" |
|
|
96 -#else |
|
|
97 -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" |
|
|
98 -#endif |
|
|
99 - |
|
|
100 -#ifdef OCTAVE_LOCALVEROCTFILEDIR |
|
|
101 -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" |
|
|
102 -#else |
|
|
103 -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" |
|
|
104 -#endif |
|
|
105 - |
|
|
106 -#ifdef OCTAVE_LOCALVERARCHLIBDIR |
|
|
107 -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" |
|
|
108 -#else |
|
|
109 -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" |
|
|
110 -#endif |
|
|
111 - |
|
|
112 -const char *infom = INFOM; |
|
|
113 -const char *infoo = INFOO; |
|
|
114 -const char *infox = INFOX; |
|
|
115 -const char *infoh = INFOH; |
|
|
116 -const char *infov = INFOV; |
|
|
117 -EOF |
|
|
118 - |
|
|
119 - $MKOCTFILE conftest.cc || as_fn_error $? "Could not run $MKOCTFILE" "$LINENO" 5 |
|
|
120 - |
|
|
121 - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` |
|
|
122 - rm -rf conftest* |
|
|
123 - |
|
|
124 - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` |
|
|
125 - subver=`echo $INFOV | sed -e "s/^[^.]*[.][^.]*[.]//"` |
|
|
126 - alt_mbase=`echo $INFOM | sed -e "s,\/[^\/]*$,,"` |
|
|
127 - alt_obase=`echo $INFOO | sed -e "s,/site.*$,/site,"` |
|
|
128 - test -z "$mpath" && mpath=$INFOM/octave-forge |
|
|
129 - test -z "$opath" && opath=$INFOO/octave-forge |
|
|
130 - test -z "$xpath" && xpath=$INFOX |
|
|
131 - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m |
|
|
132 - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH |
|
|
133 fi |
|
|
134 |
|
|
135 |
|
|
136 @@ -2880,6 +2790,7 @@ |
|
|
137 $as_echo "$OCTAVE_VERSION" >&6; } |
|
|
138 |
|
|
139 |
|
|
140 +ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"` |
|
|
141 |
|
|
142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5 |
|
|
143 $as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; } |
|
|
144 @@ -2897,6 +2808,34 @@ |
|
|
145 |
|
|
146 |
|
|
147 |
|
|
148 +if test -z "$mpath"; then |
|
|
149 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVERFCNFILEDIR in octave-config" >&5 |
|
|
150 +$as_echo_n "checking for LOCALVERFCNFILEDIR in octave-config... " >&6; } |
|
|
151 +mpath=`$OCTAVE_CONFIG -p LOCALVERFCNFILEDIR` |
|
|
152 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mpath" >&5 |
|
|
153 +$as_echo "$mpath" >&6; } |
|
|
154 + |
|
|
155 + |
|
|
156 +fi |
|
|
157 +if test -z "$opath"; then |
|
|
158 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVEROCTFILEDIR in octave-config" >&5 |
|
|
159 +$as_echo_n "checking for LOCALVEROCTFILEDIR in octave-config... " >&6; } |
|
|
160 +opath=`$OCTAVE_CONFIG -p LOCALVEROCTFILEDIR` |
|
|
161 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $opath" >&5 |
|
|
162 +$as_echo "$opath" >&6; } |
|
|
163 + |
|
|
164 + |
|
|
165 +fi |
|
|
166 +if test -z "$xpath"; then |
|
|
167 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVERARCHLIBDIR in octave-config" >&5 |
|
|
168 +$as_echo_n "checking for LOCALVERARCHLIBDIR in octave-config... " >&6; } |
|
|
169 +xpath=`$OCTAVE_CONFIG -p LOCALVERARCHLIBDIR` |
|
|
170 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xpath" >&5 |
|
|
171 +$as_echo "$xpath" >&6; } |
|
|
172 + |
|
|
173 + |
|
|
174 +fi |
|
|
175 + |
|
|
176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 |
|
|
177 $as_echo_n "checking whether ln -s works... " >&6; } |
|
|
178 LN_S=$as_ln_s |
|
|
179 @@ -3065,9 +3004,6 @@ |
|
|
180 m-files: $mpath |
|
|
181 oct-files: $opath |
|
|
182 binaries: $xpath |
|
|
183 -alternatives: |
|
|
184 - m-files: $altmpath |
|
|
185 - oct-files: $altopath |
|
|
186 |
|
|
187 shell commands will install into the following directories: |
|
|
188 binaries: $bindir |
|
|
189 @@ -3077,8 +3013,8 @@ |
|
|
190 |
|
|
191 octave-forge is configured with |
|
|
192 octave: $OCTAVE (version $OCTAVE_VERSION) |
|
|
193 - mkoctfile: $MKOCTFILE for Octave $subver |
|
|
194 - octave-config: $OCTAVE_CONFIG for Octave $subver" |
|
|
195 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION |
|
|
196 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION" |
|
|
197 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" |
|
|
198 |
|
|
199 |
|
|
200 diff -ur linear-algebra.orig/src/configure.base linear-algebra/src/configure.base |
|
|
201 --- linear-algebra.orig/src/configure.base 2017-07-13 15:57:44.644246010 -0400 |
|
|
202 +++ linear-algebra/src/configure.base 2017-07-13 16:01:17.552247526 -0400 |
|
|
203 @@ -53,13 +53,9 @@ |
|
|
204 test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path]) |
|
|
205 |
|
|
206 AC_SUBST(ver) |
|
|
207 -AC_SUBST(subver) |
|
|
208 AC_SUBST(mpath) |
|
|
209 AC_SUBST(opath) |
|
|
210 AC_SUBST(xpath) |
|
|
211 -AC_SUBST(altpath) |
|
|
212 -AC_SUBST(altmpath) |
|
|
213 -AC_SUBST(altopath) |
|
|
214 |
|
|
215 AC_ARG_WITH(path, |
|
|
216 [ --with-path install path prefix], |
|
|
217 @@ -73,83 +69,11 @@ |
|
|
218 AC_ARG_WITH(xpath, |
|
|
219 [ --with-xpath override path for executables], |
|
|
220 [xpath=$withval]) |
|
|
221 -AC_ARG_WITH(altpath, |
|
|
222 - [ --with-altpath alternative functions install path prefix], |
|
|
223 - [ altpath=$withval ]) |
|
|
224 -AC_ARG_WITH(altmpath, |
|
|
225 - [ --with-altmpath override path for alternative m-files], |
|
|
226 - [altmpath=$withval]) |
|
|
227 -AC_ARG_WITH(altopath, |
|
|
228 - [ --with-altopath override path for alternative oct-files], |
|
|
229 - [altopath=$withval]) |
|
|
230 |
|
|
231 if test -n "$path" ; then |
|
|
232 test -z "$mpath" && mpath=$path |
|
|
233 test -z "$opath" && opath=$path/oct |
|
|
234 test -z "$xpath" && xpath=$path/bin |
|
|
235 - test -z "$altpath" && altpath=$path-alternatives |
|
|
236 -fi |
|
|
237 - |
|
|
238 -if test -n "$altpath" ; then |
|
|
239 - test -z "$altmpath" && altmpath=$altpath |
|
|
240 - test -z "$altopath" && altopath=$altpath/oct |
|
|
241 -fi |
|
|
242 - |
|
|
243 -dnl Don't query if path/ver are given in the configure environment |
|
|
244 -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then |
|
|
245 -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then |
|
|
246 - dnl Construct program to get mkoctfile version and local install paths |
|
|
247 - cat > conftest.cc <<EOF |
|
|
248 -#include <octave/config.h> |
|
|
249 -#include <octave/version.h> |
|
|
250 -#include <octave/defaults.h> |
|
|
251 - |
|
|
252 -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" |
|
|
253 - |
|
|
254 -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" |
|
|
255 - |
|
|
256 -#ifdef OCTAVE_LOCALVERFCNFILEDIR |
|
|
257 -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" |
|
|
258 -#else |
|
|
259 -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" |
|
|
260 -#endif |
|
|
261 - |
|
|
262 -#ifdef OCTAVE_LOCALVEROCTFILEDIR |
|
|
263 -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" |
|
|
264 -#else |
|
|
265 -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" |
|
|
266 -#endif |
|
|
267 - |
|
|
268 -#ifdef OCTAVE_LOCALVERARCHLIBDIR |
|
|
269 -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" |
|
|
270 -#else |
|
|
271 -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" |
|
|
272 -#endif |
|
|
273 - |
|
|
274 -const char *infom = INFOM; |
|
|
275 -const char *infoo = INFOO; |
|
|
276 -const char *infox = INFOX; |
|
|
277 -const char *infoh = INFOH; |
|
|
278 -const char *infov = INFOV; |
|
|
279 -EOF |
|
|
280 - |
|
|
281 - dnl Compile program perhaps with a special version of mkoctfile |
|
|
282 - $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE) |
|
|
283 - |
|
|
284 - dnl Strip the config info from the compiled file |
|
|
285 - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` |
|
|
286 - rm -rf conftest* |
|
|
287 - |
|
|
288 - dnl set the appropriate variables if they are not already set |
|
|
289 - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` |
|
|
290 - subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"` |
|
|
291 - alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"` |
|
|
292 - alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"` |
|
|
293 - test -z "$mpath" && mpath=$INFOM/octave-forge |
|
|
294 - test -z "$opath" && opath=$INFOO/octave-forge |
|
|
295 - test -z "$xpath" && xpath=$INFOX |
|
|
296 - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m |
|
|
297 - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH |
|
|
298 fi |
|
|
299 |
|
|
300 dnl ******************************************************************* |
|
|
301 @@ -269,6 +193,7 @@ |
|
|
302 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version |
|
|
303 AC_CHECK_PROG(OCTAVE,octave,octave) |
|
|
304 OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION) |
|
|
305 +ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"` |
|
|
306 |
|
|
307 dnl grab canonical host type so we can write system specific install stuff |
|
|
308 OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type) |
|
|
309 @@ -276,6 +201,16 @@ |
|
|
310 dnl grab SHLEXT from octave config |
|
|
311 OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT) |
|
|
312 |
|
|
313 +if test -z "$mpath"; then |
|
|
314 +OCTAVE_CONFIG_EVAL(LOCALVERFCNFILEDIR,mpath) |
|
|
315 +fi |
|
|
316 +if test -z "$opath"; then |
|
|
317 +OCTAVE_CONFIG_EVAL(LOCALVEROCTFILEDIR,opath) |
|
|
318 +fi |
|
|
319 +if test -z "$xpath"; then |
|
|
320 +OCTAVE_CONFIG_EVAL(LOCALVERARCHLIBDIR,xpath) |
|
|
321 +fi |
|
|
322 + |
|
|
323 AC_PROG_LN_S |
|
|
324 |
|
|
325 AC_PROG_RANLIB |
|
|
326 @@ -313,9 +248,6 @@ |
|
|
327 m-files: $mpath |
|
|
328 oct-files: $opath |
|
|
329 binaries: $xpath |
|
|
330 -alternatives: |
|
|
331 - m-files: $altmpath |
|
|
332 - oct-files: $altopath |
|
|
333 |
|
|
334 shell commands will install into the following directories: |
|
|
335 binaries: $bindir |
|
|
336 @@ -325,5 +257,5 @@ |
|
|
337 |
|
|
338 octave-forge is configured with |
|
|
339 octave: $OCTAVE (version $OCTAVE_VERSION) |
|
|
340 - mkoctfile: $MKOCTFILE for Octave $subver |
|
|
341 - octave-config: $OCTAVE_CONFIG for Octave $subver" |
|
|
342 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION |
|
|
343 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION" |
|
|
344 diff -ur linear-algebra.orig/src/Makeconf.in linear-algebra/src/Makeconf.in |
|
|
345 --- linear-algebra.orig/src/Makeconf.in 2017-07-13 15:57:44.644246010 -0400 |
|
|
346 +++ linear-algebra/src/Makeconf.in 2017-07-13 16:01:36.615784895 -0400 |
|
|
347 @@ -59,8 +59,6 @@ |
|
|
348 MPATH = @mpath@ |
|
|
349 OPATH = @opath@ |
|
|
350 XPATH = @xpath@ |
|
|
351 -ALTMPATH = @altmpath@ |
|
|
352 -ALTOPATH = @altopath@ |
|
|
353 |
|
|
354 %.o: %.c ; $(MKOCTFILE) -c $< |
|
|
355 %.o: %.f ; $(MKOCTFILE) -c $< |
