|
4421
|
1 diff --git a/src/configure.base b/src/configure.base |
|
|
2 index 176e152..ae67f7a 100644 |
|
|
3 --- a/src/configure.base |
|
|
4 +++ b/src/configure.base |
|
|
5 @@ -53,106 +53,6 @@ test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) |
|
|
6 AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) |
|
|
7 test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path]) |
|
|
8 |
|
|
9 -AC_SUBST(ver) |
|
|
10 -AC_SUBST(subver) |
|
|
11 -AC_SUBST(mpath) |
|
|
12 -AC_SUBST(opath) |
|
|
13 -AC_SUBST(xpath) |
|
|
14 -AC_SUBST(altpath) |
|
|
15 -AC_SUBST(altmpath) |
|
|
16 -AC_SUBST(altopath) |
|
|
17 - |
|
|
18 -AC_ARG_WITH(path, |
|
|
19 - [ --with-path install path prefix], |
|
|
20 - [ path=$withval ]) |
|
|
21 -AC_ARG_WITH(mpath, |
|
|
22 - [ --with-mpath override path for m-files], |
|
|
23 - [mpath=$withval]) |
|
|
24 -AC_ARG_WITH(opath, |
|
|
25 - [ --with-opath override path for oct-files], |
|
|
26 - [opath=$withval]) |
|
|
27 -AC_ARG_WITH(xpath, |
|
|
28 - [ --with-xpath override path for executables], |
|
|
29 - [xpath=$withval]) |
|
|
30 -AC_ARG_WITH(altpath, |
|
|
31 - [ --with-altpath alternative functions install path prefix], |
|
|
32 - [ altpath=$withval ]) |
|
|
33 -AC_ARG_WITH(altmpath, |
|
|
34 - [ --with-altmpath override path for alternative m-files], |
|
|
35 - [altmpath=$withval]) |
|
|
36 -AC_ARG_WITH(altopath, |
|
|
37 - [ --with-altopath override path for alternative oct-files], |
|
|
38 - [altopath=$withval]) |
|
|
39 - |
|
|
40 -if test -n "$path" ; then |
|
|
41 - test -z "$mpath" && mpath=$path |
|
|
42 - test -z "$opath" && opath=$path/oct |
|
|
43 - test -z "$xpath" && xpath=$path/bin |
|
|
44 - test -z "$altpath" && altpath=$path-alternatives |
|
|
45 -fi |
|
|
46 - |
|
|
47 -if test -n "$altpath" ; then |
|
|
48 - test -z "$altmpath" && altmpath=$altpath |
|
|
49 - test -z "$altopath" && altopath=$altpath/oct |
|
|
50 -fi |
|
|
51 - |
|
|
52 -dnl Don't query if path/ver are given in the configure environment |
|
|
53 -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then |
|
|
54 -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then |
|
|
55 - dnl Construct program to get mkoctfile version and local install paths |
|
|
56 - cat > conftest.cc <<EOF |
|
|
57 -#include <octave/config.h> |
|
|
58 -#include <octave/version.h> |
|
|
59 -#include <octave/defaults.h> |
|
|
60 - |
|
|
61 -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" |
|
|
62 - |
|
|
63 -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" |
|
|
64 - |
|
|
65 -#ifdef OCTAVE_LOCALVERFCNFILEDIR |
|
|
66 -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" |
|
|
67 -#else |
|
|
68 -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" |
|
|
69 -#endif |
|
|
70 - |
|
|
71 -#ifdef OCTAVE_LOCALVEROCTFILEDIR |
|
|
72 -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" |
|
|
73 -#else |
|
|
74 -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" |
|
|
75 -#endif |
|
|
76 - |
|
|
77 -#ifdef OCTAVE_LOCALVERARCHLIBDIR |
|
|
78 -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" |
|
|
79 -#else |
|
|
80 -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" |
|
|
81 -#endif |
|
|
82 - |
|
|
83 -const char *infom = INFOM; |
|
|
84 -const char *infoo = INFOO; |
|
|
85 -const char *infox = INFOX; |
|
|
86 -const char *infoh = INFOH; |
|
|
87 -const char *infov = INFOV; |
|
|
88 -EOF |
|
|
89 - |
|
|
90 - dnl Compile program perhaps with a special version of mkoctfile |
|
|
91 - $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE) |
|
|
92 - |
|
|
93 - dnl Strip the config info from the compiled file |
|
|
94 - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` |
|
|
95 - rm -rf conftest* |
|
|
96 - |
|
|
97 - dnl set the appropriate variables if they are not already set |
|
|
98 - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` |
|
|
99 - subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"` |
|
|
100 - alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"` |
|
|
101 - alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"` |
|
|
102 - test -z "$mpath" && mpath=$INFOM/octave-forge |
|
|
103 - test -z "$opath" && opath=$INFOO/octave-forge |
|
|
104 - test -z "$xpath" && xpath=$INFOX |
|
|
105 - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m |
|
|
106 - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH |
|
|
107 -fi |
|
|
108 - |
|
|
109 dnl ******************************************************************* |
|
|
110 |
|
|
111 dnl Get LDFLAGS and CPPFLAGS set by user |
|
|
112 @@ -348,23 +248,10 @@ dnl AC_CHECK_LIB([netcdf], [nc_set_chunk_cache], , [AC_MSG_ERROR(nc_set_chunk_ca |
|
|
113 |
|
|
114 CONFIGURE_OUTPUTS="Makeconf" |
|
|
115 STATUS_MSG=" |
|
|
116 -octave commands will install into the following directories: |
|
|
117 - m-files: $mpath |
|
|
118 - oct-files: $opath |
|
|
119 - binaries: $xpath |
|
|
120 -alternatives: |
|
|
121 - m-files: $altmpath |
|
|
122 - oct-files: $altopath |
|
|
123 - |
|
|
124 -shell commands will install into the following directories: |
|
|
125 - binaries: $bindir |
|
|
126 - man pages: $mandir |
|
|
127 - libraries: $libdir |
|
|
128 - headers: $includedir |
|
|
129 - |
|
|
130 octave-forge is configured with |
|
|
131 octave: $OCTAVE (version $OCTAVE_VERSION) |
|
|
132 mkoctfile: $MKOCTFILE for Octave $subver |
|
|
133 octave-config: $OCTAVE_CONFIG for Octave $subver |
|
|
134 + nc-config: $NC_CONFIG |
|
|
135 netCDF compiler flags: $NETCDF_CFLAGS |
|
|
136 netCDF libraries: $NETCDF_LIBS" |
