summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2009-10-21 08:56:22 +0200
committerAllan CORNET <allan.cornet@scilab.org>2009-10-21 08:56:22 +0200
commit4fda65c45b20ac94a3a969676b0dacbcb530e6e4 (patch)
tree920fb43de980b4b36d4706c9aea2275a7bfc6295
parent38f91c66f619f00acdda77b1eeb8fd9eecd92133 (diff)
downloadscilab-4fda65c45b20ac94a3a969676b0dacbcb530e6e4.zip
scilab-4fda65c45b20ac94a3a969676b0dacbcb530e6e4.tar.gz
disable metanet
-rwxr-xr-xscilab/configure3
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in22
5 files changed, 11 insertions, 18 deletions
diff --git a/scilab/configure b/scilab/configure
index 4b753aa..ac6d999 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -34305,7 +34305,7 @@ if test "$enable_stop_on_warning" = yes; then
34305 CXXFLAGS="$CXXFLAGS -Werror -O0" 34305 CXXFLAGS="$CXXFLAGS -Werror -O0"
34306fi 34306fi
34307 34307
34308ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" 34308ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
34309 34309
34310 34310
34311# Detection of the module for the future version of Scilab 6 34311# Detection of the module for the future version of Scilab 6
@@ -35648,7 +35648,6 @@ do
35648 "modules/interpolation/Makefile") CONFIG_FILES="$CONFIG_FILES modules/interpolation/Makefile" ;; 35648 "modules/interpolation/Makefile") CONFIG_FILES="$CONFIG_FILES modules/interpolation/Makefile" ;;
35649 "modules/intersci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/intersci/Makefile" ;; 35649 "modules/intersci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/intersci/Makefile" ;;
35650 "modules/localization/Makefile") CONFIG_FILES="$CONFIG_FILES modules/localization/Makefile" ;; 35650 "modules/localization/Makefile") CONFIG_FILES="$CONFIG_FILES modules/localization/Makefile" ;;
35651 "modules/metanet/Makefile") CONFIG_FILES="$CONFIG_FILES modules/metanet/Makefile" ;;
35652 "modules/cacsd/Makefile") CONFIG_FILES="$CONFIG_FILES modules/cacsd/Makefile" ;; 35651 "modules/cacsd/Makefile") CONFIG_FILES="$CONFIG_FILES modules/cacsd/Makefile" ;;
35653 "modules/boolean/Makefile") CONFIG_FILES="$CONFIG_FILES modules/boolean/Makefile" ;; 35652 "modules/boolean/Makefile") CONFIG_FILES="$CONFIG_FILES modules/boolean/Makefile" ;;
35654 "modules/integer/Makefile") CONFIG_FILES="$CONFIG_FILES modules/integer/Makefile" ;; 35653 "modules/integer/Makefile") CONFIG_FILES="$CONFIG_FILES modules/integer/Makefile" ;;
diff --git a/scilab/configure.ac b/scilab/configure.ac
index eaa6672..038f988 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1489,7 +1489,6 @@ modules/arnoldi/Makefile
1489modules/interpolation/Makefile 1489modules/interpolation/Makefile
1490modules/intersci/Makefile 1490modules/intersci/Makefile
1491modules/localization/Makefile 1491modules/localization/Makefile
1492modules/metanet/Makefile
1493modules/cacsd/Makefile 1492modules/cacsd/Makefile
1494modules/boolean/Makefile 1493modules/boolean/Makefile
1495modules/integer/Makefile 1494modules/integer/Makefile
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index ac6ff3c..5c06116 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -53,7 +53,6 @@
53<module name="statistics" activate="yes"/> 53<module name="statistics" activate="yes"/>
54<module name="arnoldi" activate="yes"/> 54<module name="arnoldi" activate="yes"/>
55<module name="compatibility_functions" activate="yes"/> 55<module name="compatibility_functions" activate="yes"/>
56<module name="metanet" activate="yes"/>
57<module name="javasci" activate="@JAVASCI_ENABLE@"/> 56<module name="javasci" activate="@JAVASCI_ENABLE@"/>
58<module name="maple2scilab" activate="yes"/> 57<module name="maple2scilab" activate="yes"/>
59<module name="m2sci" activate="yes"/> 58<module name="m2sci" activate="yes"/>
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index a341615..caf32d4 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -55,7 +55,6 @@ double \
55pvm \ 55pvm \
56io \ 56io \
57intersci \ 57intersci \
58metanet \
59signal_processing \ 58signal_processing \
60core \ 59core \
61call_scilab \ 60call_scilab \
@@ -180,7 +179,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
180# These libraries are loaded dynamically from Scilab. 179# These libraries are loaded dynamically from Scilab.
181ENGINE_LIBS_DYNAMIC_LOAD = \ 180ENGINE_LIBS_DYNAMIC_LOAD = \
182 $(top_builddir)/modules/optimization/libscioptimization.la \ 181 $(top_builddir)/modules/optimization/libscioptimization.la \
183 $(top_builddir)/modules/metanet/libscimetanet.la \
184 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 182 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
185 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 183 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
186 $(top_builddir)/modules/symbolic/libscisymbolic.la \ 184 $(top_builddir)/modules/symbolic/libscisymbolic.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 9d99f28..c6a6a0c 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -155,10 +155,10 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \
155 optimization symbolic randlib statistics special_functions \ 155 optimization symbolic randlib statistics special_functions \
156 interpolation linear_algebra integer data_structures mexlib \ 156 interpolation linear_algebra integer data_structures mexlib \
157 differential_equations cacsd polynomials boolean double pvm io \ 157 differential_equations cacsd polynomials boolean double pvm io \
158 intersci metanet signal_processing call_scilab sound time \ 158 intersci signal_processing call_scilab sound time sparse \
159 sparse windows_tools functions overloading maple2scilab m2sci \ 159 windows_tools functions overloading maple2scilab m2sci texmacs \
160 texmacs development_tools compatibility_functions helptools \ 160 development_tools compatibility_functions helptools fftw \
161 fftw umfpack demo_tools genetic_algorithms simulated_annealing \ 161 umfpack demo_tools genetic_algorithms simulated_annealing \
162 parameters matio atoms hdf5 xcos xpad scicos_blocks scicos . \ 162 parameters matio atoms hdf5 xcos xpad scicos_blocks scicos . \
163 javasci 163 javasci
164DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 164DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -431,13 +431,12 @@ SUBDIRS = core output_stream action_binding arnoldi \
431 optimization symbolic randlib statistics special_functions \ 431 optimization symbolic randlib statistics special_functions \
432 interpolation linear_algebra integer data_structures mexlib \ 432 interpolation linear_algebra integer data_structures mexlib \
433 differential_equations cacsd polynomials boolean double pvm io \ 433 differential_equations cacsd polynomials boolean double pvm io \
434 intersci metanet signal_processing core call_scilab \ 434 intersci signal_processing core call_scilab interpolation \
435 interpolation sound time randlib sparse windows_tools \ 435 sound time randlib sparse windows_tools functions overloading \
436 functions overloading maple2scilab m2sci texmacs \ 436 maple2scilab m2sci texmacs development_tools \
437 development_tools compatibility_functions helptools fftw \ 437 compatibility_functions helptools fftw umfpack demo_tools \
438 umfpack demo_tools genetic_algorithms simulated_annealing \ 438 genetic_algorithms simulated_annealing parameters matio atoms \
439 parameters matio atoms hdf5 xcos xpad $(am__append_1) scicos . \ 439 hdf5 xcos xpad $(am__append_1) scicos . $(am__append_2)
440 $(am__append_2)
441 440
442#### Basic files #### 441#### Basic files ####
443libscilab_la_rootdir = $(mydatadir) 442libscilab_la_rootdir = $(mydatadir)
@@ -510,7 +509,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
510# These libraries are loaded dynamically from Scilab. 509# These libraries are loaded dynamically from Scilab.
511ENGINE_LIBS_DYNAMIC_LOAD = \ 510ENGINE_LIBS_DYNAMIC_LOAD = \
512 $(top_builddir)/modules/optimization/libscioptimization.la \ 511 $(top_builddir)/modules/optimization/libscioptimization.la \
513 $(top_builddir)/modules/metanet/libscimetanet.la \
514 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 512 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
515 $(top_builddir)/modules/interpolation/libsciinterpolation.la \ 513 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
516 $(top_builddir)/modules/symbolic/libscisymbolic.la \ 514 $(top_builddir)/modules/symbolic/libscisymbolic.la \