1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
Description: Disable scilab
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2016-08-08
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -113,7 +113,7 @@
$(top_srcdir)/m4/ax_python_devel.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/scilab.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -186,12 +186,9 @@
FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FGREP = @FGREP@
-GETFEM_BUILD_INTERFACE_PATH = @GETFEM_BUILD_INTERFACE_PATH@
-GETFEM_INTERFACE_PATH = @GETFEM_INTERFACE_PATH@
GETFEM_SERVER = @GETFEM_SERVER@
GFSERVERFLAGS = @GFSERVERFLAGS@
GREP = @GREP@
-HAVE_SCILAB = @HAVE_SCILAB@
IM_METHODS = @IM_METHODS@
IM_METHODS_LOC = @IM_METHODS_LOC@
INSTALL = @INSTALL@
@@ -263,13 +260,6 @@
RANLIB = @RANLIB@
RPC_INC_DIR = @RPC_INC_DIR@
RPC_LIB = @RPC_LIB@
-SCILAB_DIR = @SCILAB_DIR@
-SCILAB_EXE = @SCILAB_EXE@
-SCILAB_TOOLBOX_DIR = @SCILAB_TOOLBOX_DIR@
-SCILAB_VERSION = @SCILAB_VERSION@
-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
-SCILAB_VERSION_MICRO = @SCILAB_VERSION_MICRO@
-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -305,7 +295,6 @@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-has_scilab = @has_scilab@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
--- a/configure.ac
+++ b/configure.ac
@@ -506,43 +506,6 @@
AM_CONDITIONAL(BUILDPYTHON, test x$usepython = xYES)
AM_CONDITIONAL(BUILDPYTHONPAR, test x$ac_python_mpi4py = xYES)
-dnl -----------------------------------------------
-dnl SCILAB Interface
-dnl -----------------------------------------------
-
-m4_include([m4/scilab.m4])
-
-REQUIRED_SCILAB_MAJOR=6
-REQUIRED_SCILAB_MINOR=0
-REQUIRED_SCILAB_MICRO=0
-
-AC_CHECK_SCILAB
-
-GETFEM_INTERFACE_PATH="`readlink -f $srcdir`"
-GETFEM_BUILD_INTERFACE_PATH="`readlink -f $PWD`"
-AC_SUBST(GETFEM_INTERFACE_PATH)
-AC_SUBST(GETFEM_BUILD_INTERFACE_PATH)
-
-dnl if the scilab directory doesn't exists, we copy the
-dnl scilab sources into the build directory
-
-if test "x$usescilab" == "xYES"
-then
- currentdir=`pwd`
- if test ! -f $currentdir/interface/src/scilab/builder.sce
- then
- echo "Copying Scilab toolbox src in the build directory"
- mkdir -p $currentdir/interface/src/scilab/
- cp -r $srcdir/interface/src/scilab/* $currentdir/interface/src/scilab
- fi
-fi
-
-AC_ARG_WITH(scilab-toolbox-dir,
- [AS_HELP_STRING([--with-scilab-toolbox-dir],[directory in which the scilab interface will be installed])],
- SCILAB_TOOLBOX_DIR="$withval",SCILAB_TOOLBOX_DIR="$GFPREFIX/getfem_toolbox")
-AC_SUBST(SCILAB_TOOLBOX_DIR)
-
-
dnl -------------------------------BLAS----------------------------------
dnl why I hate autoconf: if the code below is put into a separate file,
@@ -1248,8 +1211,6 @@
interface/src/octave/private/Makefile \
interface/src/python/Makefile \
interface/src/python/setup.py \
-interface/src/scilab/Makefile \
-interface/src/scilab/sci_gateway/c/builder_gateway_c.sce \
interface/tests/Makefile \
interface/tests/meshes/Makefile \
interface/tests/matlab-octave/Makefile \
--- a/interface/src/Makefile.am
+++ b/interface/src/Makefile.am
@@ -27,11 +27,7 @@
subdirPYTHON=python
endif
-if BUILDSCILAB
-subdirSCILAB=scilab
-endif
-
-SUBDIRS = . $(subdirMATLAB) $(subdirOCTAVE) $(subdirPYTHON) $(subdirSCILAB)
+SUBDIRS = . $(subdirMATLAB) $(subdirOCTAVE) $(subdirPYTHON)
RPC_INC_DIR=@RPC_INC_DIR@
|
