summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2011-08-01 13:58:26 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2011-08-05 15:11:34 +0200
commitba53e1b087b3cd3e8b42fce642de6dbc8e9caca8 (patch)
tree67ed7fef4f420dcee32784bcc47bde23af7b7b86 /scilab
parenteb589c47ee53edd102d6c50a50f31217e8a13522 (diff)
downloadscilab-ba53e1b087b3cd3e8b42fce642de6dbc8e9caca8.zip
scilab-ba53e1b087b3cd3e8b42fce642de6dbc8e9caca8.tar.gz
PVM moved as ATOMS module atomsInstall('PVM')
Change-Id: I605017971cdc1074df5294b30003e130b4e9afa7
Diffstat (limited to 'scilab')
-rw-r--r--scilab/.gitignore7
-rw-r--r--scilab/ACKNOWLEDGEMENTS3
-rw-r--r--scilab/CHANGES_5.4.X3
-rw-r--r--scilab/Makefile.in13
-rw-r--r--scilab/Makefile.incl.in5
-rw-r--r--scilab/Scilab.sln13
-rw-r--r--scilab/Scilab_f2c.sln10
-rw-r--r--scilab/aclocal.m41
-rwxr-xr-xscilab/bin/scilab11
-rwxr-xr-xscilab/configure648
-rw-r--r--scilab/configure.ac30
-rw-r--r--scilab/contrib/Makefile.in13
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/etc/modules.xml.vc1
-rw-r--r--scilab/etc/scilab.start1
-rw-r--r--scilab/libs/MALLOC/Makefile.in13
-rw-r--r--scilab/libs/Makefile.in13
-rw-r--r--scilab/libs/blas/Makefile.in5
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in13
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in13
-rw-r--r--scilab/libs/hashtable/Makefile.in13
-rw-r--r--scilab/libs/lapack/Makefile.in5
-rw-r--r--scilab/libs/libst/Makefile.in13
-rw-r--r--scilab/m4/pvm.m4362
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in18
-rw-r--r--scilab/modules/action_binding/Makefile.in13
-rw-r--r--scilab/modules/api_scilab/Makefile.in13
-rw-r--r--scilab/modules/arnoldi/Makefile.in13
-rw-r--r--scilab/modules/atoms/Makefile.in13
-rw-r--r--scilab/modules/boolean/Makefile.in13
-rw-r--r--scilab/modules/cacsd/Makefile.in13
-rw-r--r--scilab/modules/call_scilab/Makefile.in13
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak2
-rw-r--r--scilab/modules/commons/Makefile.in13
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in13
-rw-r--r--scilab/modules/completion/Makefile.in13
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref1
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_2848.tst1
-rw-r--r--scilab/modules/console/Makefile.in13
-rw-r--r--scilab/modules/core/Makefile.am3
-rw-r--r--scilab/modules/core/Makefile.in16
-rw-r--r--scilab/modules/core/help/en_US/getversion.xml10
-rw-r--r--scilab/modules/core/help/en_US/with_pvm.xml29
-rw-r--r--scilab/modules/core/help/fr_FR/with_pvm.xml31
-rw-r--r--scilab/modules/core/help/ja_JP/getversion.xml4
-rw-r--r--scilab/modules/core/help/ja_JP/with_pvm.xml34
-rw-r--r--scilab/modules/core/help/pt_BR/getversion.xml8
-rw-r--r--scilab/modules/core/help/pt_BR/with_pvm.xml47
-rw-r--r--scilab/modules/core/includes/callinterf.h2
-rw-r--r--scilab/modules/core/includes/getversion.h6
-rw-r--r--scilab/modules/core/includes/machine.h.in3
-rw-r--r--scilab/modules/core/macros/with_pvm.sci4
-rw-r--r--scilab/modules/core/src/c/callinterf.c2
-rw-r--r--scilab/modules/core/src/c/core.vcxproj8
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.c21
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.h7
-rw-r--r--scilab/modules/core/src/c/getstaticdebuginfo.c9
-rw-r--r--scilab/modules/core/src/c/getversion.c21
-rw-r--r--scilab/modules/data_structures/Makefile.in13
-rw-r--r--scilab/modules/demo_tools/Makefile.in13
-rw-r--r--scilab/modules/development_tools/Makefile.in13
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in13
-rw-r--r--scilab/modules/differential_equations/Makefile.in13
-rw-r--r--scilab/modules/double/Makefile.in13
-rw-r--r--scilab/modules/dynamic_link/Makefile.in13
-rw-r--r--scilab/modules/elementary_functions/Makefile.in13
-rw-r--r--scilab/modules/fftw/Makefile.in13
-rw-r--r--scilab/modules/fileio/Makefile.in13
-rw-r--r--scilab/modules/functions/Makefile.in13
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in13
-rw-r--r--scilab/modules/graph/Makefile.in13
-rw-r--r--scilab/modules/graphic_export/Makefile.in13
-rw-r--r--scilab/modules/graphics/Makefile.in13
-rw-r--r--scilab/modules/gui/Makefile.in13
-rw-r--r--scilab/modules/hdf5/Makefile.in13
-rw-r--r--scilab/modules/helptools/Makefile.in13
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt1
-rw-r--r--scilab/modules/helptools/etc/MAIN_CHAPTERS1
-rw-r--r--scilab/modules/history_browser/Makefile.in13
-rw-r--r--scilab/modules/history_manager/Makefile.in13
-rw-r--r--scilab/modules/integer/Makefile.in13
-rw-r--r--scilab/modules/interpolation/Makefile.in13
-rw-r--r--scilab/modules/intersci/Makefile.in13
-rw-r--r--scilab/modules/io/Makefile.in13
-rw-r--r--scilab/modules/javasci/Makefile.in13
-rw-r--r--scilab/modules/jvm/Makefile.in13
-rw-r--r--scilab/modules/linear_algebra/Makefile.in13
-rw-r--r--scilab/modules/localization/Makefile.in13
-rw-r--r--scilab/modules/m2sci/Makefile.in13
-rw-r--r--scilab/modules/maple2scilab/Makefile.in13
-rw-r--r--scilab/modules/matio/Makefile.in13
-rw-r--r--scilab/modules/mexlib/Makefile.in13
-rw-r--r--scilab/modules/modules_manager/Makefile.in13
-rw-r--r--scilab/modules/optimization/Makefile.in13
-rw-r--r--scilab/modules/output_stream/Makefile.in13
-rw-r--r--scilab/modules/overloading/Makefile.in13
-rw-r--r--scilab/modules/parallel/Makefile.in13
-rw-r--r--scilab/modules/parameters/Makefile.in13
-rw-r--r--scilab/modules/polynomials/Makefile.in13
-rw-r--r--scilab/modules/pvm/.gitignore7
-rw-r--r--scilab/modules/pvm/LibScilab_Import.def29
-rw-r--r--scilab/modules/pvm/Makefile.am116
-rw-r--r--scilab/modules/pvm/Makefile.in1923
-rw-r--r--scilab/modules/pvm/demos/pvm.dem.gateway.sce18
-rw-r--r--scilab/modules/pvm/demos/pvm.dem.sce44
-rw-r--r--scilab/modules/pvm/demos/pvm1.sce97
-rw-r--r--scilab/modules/pvm/demos/script.sce27
-rwxr-xr-xscilab/modules/pvm/etc/.pvmd.conf1
-rw-r--r--scilab/modules/pvm/etc/pvm.quit10
-rw-r--r--scilab/modules/pvm/etc/pvm.start25
-rw-r--r--scilab/modules/pvm/help/en_US/addchapter.sce11
-rw-r--r--scilab/modules/pvm/help/en_US/pvm.xml115
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_addhosts.xml76
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_barrier.xml77
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_bcast.xml93
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_bufinfo.xml83
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_config.xml113
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_delhosts.xml68
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_error.xml47
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_exit.xml60
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_f772sci.xml71
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_get_timer.xml65
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_getinst.xml70
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_gettid.xml70
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_gsize.xml63
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_halt.xml82
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_joingroup.xml73
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_kill.xml67
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_lvgroup.xml65
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_mytid.xml76
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_parent.xml54
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_probe.xml91
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_recv.xml120
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_reduce.xml110
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_sci2f77.xml70
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_send.xml99
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_set_timer.xml58
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_spawn.xml122
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_spawn_independent.xml111
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_start.xml97
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_tasks.xml154
-rw-r--r--scilab/modules/pvm/help/en_US/pvm_tidtohost.xml62
-rw-r--r--scilab/modules/pvm/help/en_US/pvmd3.xml289
-rw-r--r--scilab/modules/pvm/help/fr_FR/addchapter.sce11
-rwxr-xr-xscilab/modules/pvm/help/ja_JP/addchapter.sce11
-rw-r--r--scilab/modules/pvm/help/pt_BR/addchapter.sce11
-rw-r--r--scilab/modules/pvm/includes/dynlib_pvm.h28
-rw-r--r--scilab/modules/pvm/includes/gw_pvm.h56
-rw-r--r--scilab/modules/pvm/license.txt11
-rw-r--r--scilab/modules/pvm/locales/ca_ES.po234
-rw-r--r--scilab/modules/pvm/locales/de_DE.po233
-rw-r--r--scilab/modules/pvm/locales/es_ES.po233
-rw-r--r--scilab/modules/pvm/locales/fr_FR.po232
-rw-r--r--scilab/modules/pvm/locales/it_IT.po234
-rw-r--r--scilab/modules/pvm/locales/ja_JP.po307
-rw-r--r--scilab/modules/pvm/locales/pl_PL.po221
-rw-r--r--scilab/modules/pvm/locales/pt_BR.po231
-rw-r--r--scilab/modules/pvm/locales/pvm.pot247
-rw-r--r--scilab/modules/pvm/locales/ru_RU.po234
-rw-r--r--scilab/modules/pvm/locales/uk_UA.po236
-rw-r--r--scilab/modules/pvm/locales/zh_CN.po201
-rw-r--r--scilab/modules/pvm/locales/zh_TW.po230
-rw-r--r--scilab/modules/pvm/locales_macros/ca_ES.po21
-rw-r--r--scilab/modules/pvm/locales_macros/de_DE.po21
-rw-r--r--scilab/modules/pvm/locales_macros/es_ES.po21
-rw-r--r--scilab/modules/pvm/locales_macros/fr_FR.po21
-rw-r--r--scilab/modules/pvm/locales_macros/it_IT.po21
-rw-r--r--scilab/modules/pvm/locales_macros/ja_JP.po23
-rw-r--r--scilab/modules/pvm/locales_macros/pl_PL.po21
-rw-r--r--scilab/modules/pvm/locales_macros/pt_BR.po21
-rw-r--r--scilab/modules/pvm/locales_macros/pvm-macros.pot25
-rw-r--r--scilab/modules/pvm/locales_macros/ru_RU.po21
-rw-r--r--scilab/modules/pvm/locales_macros/uk_UA.po22
-rw-r--r--scilab/modules/pvm/locales_macros/zh_CN.po21
-rw-r--r--scilab/modules/pvm/locales_macros/zh_TW.po21
-rw-r--r--scilab/modules/pvm/macros/buildmacros.bat1
-rw-r--r--scilab/modules/pvm/macros/buildmacros.sce18
-rw-r--r--scilab/modules/pvm/macros/cleanmacros.bat3
-rw-r--r--scilab/modules/pvm/macros/configure_pvm.sci70
-rw-r--r--scilab/modules/pvm/pvm.iss57
-rw-r--r--scilab/modules/pvm/pvm.vcxproj321
-rw-r--r--scilab/modules/pvm/pvm.vcxproj.filters184
-rw-r--r--scilab/modules/pvm/sci_gateway/c/gw_pvm.c60
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_addhosts.c44
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_barrier.c42
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_bcast.c61
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_bufinfo.c44
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_config.c64
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_delhosts.c42
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_error.c39
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_error_mode.c75
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_exit.c38
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_f772sci.c49
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_get_timer.c36
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_getinst.c41
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_gettid.c41
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_gsize.c39
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_halt.c37
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_joingroup.c40
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_kill.c42
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_lvgroup.c40
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_mytid.c36
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_parent.c36
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_probe.c40
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_recv.c69
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_recv_var.c48
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_reduce.c53
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_sci2f77.c47
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_send.c66
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_send_var.c49
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_set_timer.c37
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_spawn.c64
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_spawn_independent.c56
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_start.c47
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_tasks.c70
-rw-r--r--scilab/modules/pvm/sci_gateway/c/sci_pvm_tidtohost.c40
-rw-r--r--scilab/modules/pvm/sci_gateway/pvm_gateway.xml66
-rw-r--r--scilab/modules/pvm/src/c/DllmainPVM.c33
-rw-r--r--scilab/modules/pvm/src/c/pvm.rc97
-rw-r--r--scilab/modules/pvm/src/c/pvm_grp.c148
-rw-r--r--scilab/modules/pvm/src/c/pvm_info.c166
-rw-r--r--scilab/modules/pvm/src/c/pvm_proc_ctrl.c493
-rw-r--r--scilab/modules/pvm/src/c/pvm_recv.c225
-rw-r--r--scilab/modules/pvm/src/c/pvm_send.c211
-rw-r--r--scilab/modules/pvm/src/c/sci_pvm.h290
-rw-r--r--scilab/modules/pvm/src/c/sci_tools.c135
-rw-r--r--scilab/modules/pvm/src/c/sci_tools.h101
-rw-r--r--scilab/modules/pvm/src/c/scipvmf77.c263
-rw-r--r--scilab/modules/pvm/src/c/varpack.c364
-rw-r--r--scilab/modules/pvm/src/nopvm/nopvm.c30
-rw-r--r--scilab/modules/pvm/tests/unit_tests/pvm.dia.ref398
-rw-r--r--scilab/modules/pvm/tests/unit_tests/pvm.tst221
-rw-r--r--scilab/modules/randlib/Makefile.in13
-rw-r--r--scilab/modules/renderer/Makefile.in13
-rw-r--r--scilab/modules/scicos/Makefile.in13
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in13
-rw-r--r--scilab/modules/scinotes/Makefile.in13
-rw-r--r--scilab/modules/signal_processing/Makefile.in13
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in13
-rw-r--r--scilab/modules/sound/Makefile.in13
-rw-r--r--scilab/modules/sparse/Makefile.am1
-rw-r--r--scilab/modules/sparse/Makefile.in39
-rw-r--r--scilab/modules/sparse/src/fortran/mycmatptr.f238
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.vfproj1
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f2c.vcxproj2
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f2c.vcxproj.filters6
-rw-r--r--scilab/modules/special_functions/Makefile.in13
-rw-r--r--scilab/modules/spreadsheet/Makefile.in13
-rw-r--r--scilab/modules/statistics/Makefile.in13
-rw-r--r--scilab/modules/string/Makefile.in13
-rw-r--r--scilab/modules/symbolic/Makefile.in13
-rw-r--r--scilab/modules/tclsci/Makefile.in13
-rw-r--r--scilab/modules/tclsci/tcl/sciGUI/data/dontshow.txt1
-rw-r--r--scilab/modules/texmacs/Makefile.in13
-rw-r--r--scilab/modules/time/Makefile.in13
-rw-r--r--scilab/modules/types/Makefile.in13
-rw-r--r--scilab/modules/ui_data/Makefile.in13
-rw-r--r--scilab/modules/umfpack/Makefile.in13
-rw-r--r--scilab/modules/windows_tools/Makefile.in13
-rw-r--r--scilab/modules/xcos/Makefile.in13
-rw-r--r--scilab/tools/innosetup/ca_ES_scilab.isl1
-rw-r--r--scilab/tools/innosetup/code_modules.iss5
-rw-r--r--scilab/tools/innosetup/components.iss3
-rw-r--r--scilab/tools/innosetup/de_DE_scilab.isl1
-rw-r--r--scilab/tools/innosetup/en_US_scilab.isl1
-rw-r--r--scilab/tools/innosetup/es_ES_scilab.isl1
-rw-r--r--scilab/tools/innosetup/files.iss1
-rw-r--r--scilab/tools/innosetup/fr_FR_scilab.isl1
-rw-r--r--scilab/tools/innosetup/it_IT_scilab.isl1
-rw-r--r--scilab/tools/innosetup/ja_JP_scilab.isl1
-rw-r--r--scilab/tools/innosetup/pl_PL_scilab.isl1
-rw-r--r--scilab/tools/innosetup/pt_BR_scilab.isl1
-rw-r--r--scilab/tools/innosetup/ru_RU_scilab.isl1
-rw-r--r--scilab/tools/innosetup/uk_UA_scilab.isl1
-rw-r--r--scilab/tools/innosetup/zh_CN_scilab.isl1
-rw-r--r--scilab/tools/innosetup/zh_TW_scilab.isl1
277 files changed, 417 insertions, 16504 deletions
diff --git a/scilab/.gitignore b/scilab/.gitignore
index 0f4099e..e81a134 100644
--- a/scilab/.gitignore
+++ b/scilab/.gitignore
@@ -140,7 +140,6 @@ scilab.properties
140scilab-lib.properties 140scilab-lib.properties
141scilab-lib-doc.properties 141scilab-lib-doc.properties
142scilab.pc 142scilab.pc
143pvm3
144*.class 143*.class
145*.dia 144*.dia
146 145
@@ -149,10 +148,6 @@ pvm3
149# 148#
150.svn 149.svn
151 150
152#
153# pvm configuration file
154#
155.pvmd.conf
156 151
157# atoms generated files 152# atoms generated files
158.atoms 153.atoms
@@ -170,3 +165,5 @@ modules/types/src/jni/sci_types_wrap.c
170 165
171# clang / scan-build generated temporary files 166# clang / scan-build generated temporary files
172modules/*/*.plist 167modules/*/*.plist
168
169modules/pvm/ \ No newline at end of file
diff --git a/scilab/ACKNOWLEDGEMENTS b/scilab/ACKNOWLEDGEMENTS
index 769402f..a3f6ff0 100644
--- a/scilab/ACKNOWLEDGEMENTS
+++ b/scilab/ACKNOWLEDGEMENTS
@@ -216,9 +216,6 @@ optim: optimization routines (Modulopt library, INRIA).
216poly: Scilab polynomial library (INRIA). 216poly: Scilab polynomial library (INRIA).
217 217
218 218
219pvm: interface routines with PVM developed by ReMaP and Resedas projects
220 at INRIA.
221
222qsort: qsort.c ( quicksort from the University of California Berkeley) 219qsort: qsort.c ( quicksort from the University of California Berkeley)
223 modified for Scilab. 220 modified for Scilab.
224 221
diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 2a00b5d..33633f4 100644
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -263,6 +263,9 @@ Misc:
263* Options -disable-exception-catching added under GNU/Linux & Mac OS X. 263* Options -disable-exception-catching added under GNU/Linux & Mac OS X.
264 Disables the Scilab exception catching system. 264 Disables the Scilab exception catching system.
265 265
266* PVM module moved as ATOMS module.
267 atomsInstall('PVM')
268
266 269
267Bug fixes: 270Bug fixes:
268========== 271==========
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 97a34a3..255deb2 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -106,10 +106,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
106 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 106 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
107 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 107 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
108 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 108 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
109 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 109 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
110 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 110 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
111 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 111 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
112 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 112 $(top_srcdir)/configure.ac
113am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 113am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
114 $(ACLOCAL_M4) 114 $(ACLOCAL_M4)
115am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 115am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -478,11 +478,6 @@ PCRE_VERSION = @PCRE_VERSION@
478PKG_CONFIG = @PKG_CONFIG@ 478PKG_CONFIG = @PKG_CONFIG@
479POSUB = @POSUB@ 479POSUB = @POSUB@
480POW_LIB = @POW_LIB@ 480POW_LIB = @POW_LIB@
481PVMGETARCH = @PVMGETARCH@
482PVM_ARCH = @PVM_ARCH@
483PVM_ENABLE = @PVM_ENABLE@
484PVM_INCLUDE = @PVM_INCLUDE@
485PVM_LIB = @PVM_LIB@
486PYTHON = @PYTHON@ 481PYTHON = @PYTHON@
487QDOX = @QDOX@ 482QDOX = @QDOX@
488RANLIB = @RANLIB@ 483RANLIB = @RANLIB@
diff --git a/scilab/Makefile.incl.in b/scilab/Makefile.incl.in
index fb11bef..21705ce 100644
--- a/scilab/Makefile.incl.in
+++ b/scilab/Makefile.incl.in
@@ -45,7 +45,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/fortran.m4 \
45 $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/libs_by_debian.m4 \ 45 $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/libs_by_debian.m4 \
46 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ 46 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
47 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 47 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
48 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pvm.m4 \
49 $(top_srcdir)/m4/sciman.m4 $(top_srcdir)/m4/tcltk.m4 \ 48 $(top_srcdir)/m4/sciman.m4 $(top_srcdir)/m4/tcltk.m4 \
50 $(top_srcdir)/configure.ac 49 $(top_srcdir)/configure.ac
51am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 50am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -132,10 +131,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
132PACKAGE_TARNAME = @PACKAGE_TARNAME@ 131PACKAGE_TARNAME = @PACKAGE_TARNAME@
133PACKAGE_VERSION = @PACKAGE_VERSION@ 132PACKAGE_VERSION = @PACKAGE_VERSION@
134PATH_SEPARATOR = @PATH_SEPARATOR@ 133PATH_SEPARATOR = @PATH_SEPARATOR@
135PVMARCH = @PVMARCH@
136PVMGETARCH = @PVMGETARCH@
137PVM_INCLUDE = @PVM_INCLUDE@
138PVM_LIB = @PVM_LIB@
139RANLIB = @RANLIB@ 134RANLIB = @RANLIB@
140SED = @SED@ 135SED = @SED@
141SET_MAKE = @SET_MAKE@ 136SET_MAKE = @SET_MAKE@
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 908826b..1e4404c 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -104,11 +104,6 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "polynomials_f", "modules\po
104 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 104 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
105 EndProjectSection 105 EndProjectSection
106EndProject 106EndProject
107Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcxproj", "{63352867-3983-48E3-94FE-DD8F0D6E921F}"
108 ProjectSection(ProjectDependencies) = postProject
109 {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
110 EndProjectSection
111EndProject
112Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}" 107Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
113 ProjectSection(ProjectDependencies) = postProject 108 ProjectSection(ProjectDependencies) = postProject
114 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} 109 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
@@ -742,14 +737,6 @@ Global
742 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|Win32.Build.0 = Release|Win32 737 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|Win32.Build.0 = Release|Win32
743 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.ActiveCfg = Release|x64 738 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.ActiveCfg = Release|x64
744 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.Build.0 = Release|x64 739 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.Build.0 = Release|x64
745 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|Win32.ActiveCfg = Debug|Win32
746 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|Win32.Build.0 = Debug|Win32
747 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|x64.ActiveCfg = Debug|x64
748 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|x64.Build.0 = Debug|x64
749 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|Win32.ActiveCfg = Release|Win32
750 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|Win32.Build.0 = Release|Win32
751 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|x64.ActiveCfg = Release|x64
752 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|x64.Build.0 = Release|x64
753 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.ActiveCfg = Debug|Win32 740 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.ActiveCfg = Debug|Win32
754 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.Build.0 = Debug|Win32 741 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.Build.0 = Debug|Win32
755 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|x64.ActiveCfg = Debug|x64 742 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index fe9d408..350570e 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -49,8 +49,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization_f", "modules\o
49EndProject 49EndProject
50Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polynomials_f", "modules\polynomials\src\fortran\polynomials_f2c.vcxproj", "{3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}" 50Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polynomials_f", "modules\polynomials\src\fortran\polynomials_f2c.vcxproj", "{3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}"
51EndProject 51EndProject
52Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcxproj", "{63352867-3983-48E3-94FE-DD8F0D6E921F}"
53EndProject
54Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}" 52Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
55EndProject 53EndProject
56Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib_f", "modules\randlib\src\fortran\randlib_f2c.vcxproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}" 54Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib_f", "modules\randlib\src\fortran\randlib_f2c.vcxproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}"
@@ -519,14 +517,6 @@ Global
519 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|Win32.Build.0 = Release|Win32 517 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|Win32.Build.0 = Release|Win32
520 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.ActiveCfg = Release|x64 518 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.ActiveCfg = Release|x64
521 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.Build.0 = Release|x64 519 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}.Release|x64.Build.0 = Release|x64
522 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|Win32.ActiveCfg = Debug|Win32
523 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|Win32.Build.0 = Debug|Win32
524 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|x64.ActiveCfg = Debug|x64
525 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Debug|x64.Build.0 = Debug|x64
526 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|Win32.ActiveCfg = Release|Win32
527 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|Win32.Build.0 = Release|Win32
528 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|x64.ActiveCfg = Release|x64
529 {63352867-3983-48E3-94FE-DD8F0D6E921F}.Release|x64.Build.0 = Release|x64
530 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.ActiveCfg = Debug|Win32 520 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.ActiveCfg = Debug|Win32
531 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.Build.0 = Debug|Win32 521 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|Win32.Build.0 = Debug|Win32
532 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|x64.ActiveCfg = Debug|x64 522 {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 69b4f6f..789d86a 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -3273,7 +3273,6 @@ m4_include([m4/macosx.m4])
3273m4_include([m4/ocaml.m4]) 3273m4_include([m4/ocaml.m4])
3274m4_include([m4/pcre.m4]) 3274m4_include([m4/pcre.m4])
3275m4_include([m4/pkg.m4]) 3275m4_include([m4/pkg.m4])
3276m4_include([m4/pvm.m4])
3277m4_include([m4/relocatable.m4]) 3276m4_include([m4/relocatable.m4])
3278m4_include([m4/swig.m4]) 3277m4_include([m4/swig.m4])
3279m4_include([m4/symlinks.m4]) 3278m4_include([m4/symlinks.m4])
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index 7140558..35fa447 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -613,17 +613,6 @@ cd "$LOCALOLDPWD"
613#fi 613#fi
614#export DISPLAY 614#export DISPLAY
615 615
616#if test "$PVM_ROOT" = ""; then
617# PVM_ROOT="@PVMROOTR@"
618#fi
619#export PVM_ROOT
620
621#if test "$PVM_ARCH" = ""; then
622# PVM_ARCH=$($PVM_ROOT/lib/pvmgetarch)
623#fi
624#export PVM_ARCH
625
626
627# 616#
628# Scilab will not work on some Mac OSX version 617# Scilab will not work on some Mac OSX version
629# Check version number and ask user if he wants to go on. 618# Check version number and ask user if he wants to go on.
diff --git a/scilab/configure b/scilab/configure
index 4e9986b..ab0804c 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -681,13 +681,6 @@ OPENMP_LIBS
681OPENMP_CXXFLAGS 681OPENMP_CXXFLAGS
682OPENMP_CFLAGS 682OPENMP_CFLAGS
683OPENMP_ENABLE 683OPENMP_ENABLE
684PVM_FALSE
685PVM_TRUE
686PVM_ENABLE
687PVM_INCLUDE
688PVM_LIB
689PVM_ARCH
690PVMGETARCH
691FFTW_FALSE 684FFTW_FALSE
692FFTW_TRUE 685FFTW_TRUE
693FFTW_ENABLE 686FFTW_ENABLE
@@ -956,9 +949,6 @@ with_libintl_prefix
956with_fftw 949with_fftw
957with_fftw_include 950with_fftw_include
958with_fftw_library 951with_fftw_library
959with_pvm
960with_pvm_include
961with_pvm_library
962with_openmp 952with_openmp
963with_libxml2 953with_libxml2
964enable_build_localization 954enable_build_localization
@@ -1697,9 +1687,6 @@ Optional Packages:
1697 --without-fftw Disable the interface to the FFTW 3 library 1687 --without-fftw Disable the interface to the FFTW 3 library
1698 --with-fftw-include=DIR Set the path to the FFTW headers 1688 --with-fftw-include=DIR Set the path to the FFTW headers
1699 --with-fftw-library=DIR Set the path to the FFTW libraries 1689 --with-fftw-library=DIR Set the path to the FFTW libraries
1700 --without-pvm Disable the interface to the PVM library
1701 --with-pvm-include=DIR Set the path to the PVM headers
1702 --with-pvm-library=DIR Set the path to the PVM library directory
1703 --without-openmp Disable the usage of OpenMP (parallelization of some 1690 --without-openmp Disable the usage of OpenMP (parallelization of some
1704 algoritms) 1691 algoritms)
1705 --with-libxml2=PREFIX Set the path to your libxml2 installation 1692 --with-libxml2=PREFIX Set the path to your libxml2 installation
@@ -10292,7 +10279,7 @@ $as_echo "$ac_java_classpath" >&6; }
10292$as_echo_n "checking to see if the java compiler works... " >&6; } 10279$as_echo_n "checking to see if the java compiler works... " >&6; }
10293 10280
10294 cat << \EOF > conftest.java 10281 cat << \EOF > conftest.java
10295// #line 10295 "configure" 10282// #line 10282 "configure"
10296 10283
10297 10284
10298public class conftest { 10285public class conftest {
@@ -10358,7 +10345,7 @@ $as_echo_n "checking type of jvm... " >&6; }
10358 if test "x$ac_java_jvm_name" = "x" ; then 10345 if test "x$ac_java_jvm_name" = "x" ; then
10359 10346
10360 cat << \EOF > conftest.java 10347 cat << \EOF > conftest.java
10361// #line 10361 "configure" 10348// #line 10348 "configure"
10362import gnu.java.io.EncodingManager; 10349import gnu.java.io.EncodingManager;
10363 10350
10364public class conftest { 10351public class conftest {
@@ -10422,7 +10409,7 @@ $as_echo_n "checking java API version... " >&6; }
10422 10409
10423 10410
10424 cat << \EOF > conftest.java 10411 cat << \EOF > conftest.java
10425// #line 10425 "configure" 10412// #line 10412 "configure"
10426import java.nio.charset.Charset; 10413import java.nio.charset.Charset;
10427 10414
10428public class conftest { 10415public class conftest {
@@ -10467,7 +10454,7 @@ EOF
10467 10454
10468 10455
10469 cat << \EOF > conftest.java 10456 cat << \EOF > conftest.java
10470// #line 10470 "configure" 10457// #line 10457 "configure"
10471import java.lang.StringBuilder; 10458import java.lang.StringBuilder;
10472 10459
10473public class conftest { 10460public class conftest {
@@ -10512,7 +10499,7 @@ EOF
10512 10499
10513 10500
10514 cat << \EOF > conftest.java 10501 cat << \EOF > conftest.java
10515// #line 10515 "configure" 10502// #line 10502 "configure"
10516import java.util.ArrayDeque; 10503import java.util.ArrayDeque;
10517 10504
10518public class conftest { 10505public class conftest {
@@ -11874,7 +11861,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11874 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11861 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11875 11862
11876 cat << \EOF > conftest.java 11863 cat << \EOF > conftest.java
11877// #line 11877 "configure" 11864// #line 11864 "configure"
11878import com.mxgraph.model.mxCell; 11865import com.mxgraph.model.mxCell;
11879 11866
11880public class conftest { 11867public class conftest {
@@ -11968,7 +11955,7 @@ $as_echo_n "checking minimal version (1.7.0.6) of jgraphx... " >&6; }
11968 if test "x" == "x"; then 11955 if test "x" == "x"; then
11969 11956
11970 cat << \EOF > conftest.java 11957 cat << \EOF > conftest.java
11971// #line 11971 "configure" 11958// #line 11958 "configure"
11972import com.mxgraph.view.mxGraph; 11959import com.mxgraph.view.mxGraph;
11973 11960
11974public class conftest { 11961public class conftest {
@@ -12019,7 +12006,7 @@ EOF
12019 else 12006 else
12020 12007
12021 cat << \EOF > conftest.java 12008 cat << \EOF > conftest.java
12022// #line 12022 "configure" 12009// #line 12009 "configure"
12023import com.mxgraph.view.mxGraph; 12010import com.mxgraph.view.mxGraph;
12024 12011
12025public class conftest { 12012public class conftest {
@@ -12096,7 +12083,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12096 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12083 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12097 12084
12098 cat << \EOF > conftest.java 12085 cat << \EOF > conftest.java
12099// #line 12099 "configure" 12086// #line 12086 "configure"
12100import ncsa.hdf.hdf5lib.HDF5Constants; 12087import ncsa.hdf.hdf5lib.HDF5Constants;
12101 12088
12102public class conftest { 12089public class conftest {
@@ -12249,7 +12236,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
12249 if test "x" == "x"; then 12236 if test "x" == "x"; then
12250 12237
12251 cat << \EOF > conftest.java 12238 cat << \EOF > conftest.java
12252// #line 12252 "configure" 12239// #line 12239 "configure"
12253import ncsa.hdf.hdf5lib.H5; 12240import ncsa.hdf.hdf5lib.H5;
12254 12241
12255public class conftest { 12242public class conftest {
@@ -12304,7 +12291,7 @@ EOF
12304 else 12291 else
12305 12292
12306 cat << \EOF > conftest.java 12293 cat << \EOF > conftest.java
12307// #line 12307 "configure" 12294// #line 12294 "configure"
12308import ncsa.hdf.hdf5lib.H5; 12295import ncsa.hdf.hdf5lib.H5;
12309 12296
12310public class conftest { 12297public class conftest {
@@ -12388,7 +12375,7 @@ $as_echo_n "checking flexdock... " >&6; }
12388 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12375 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12389 12376
12390 cat << \EOF > conftest.java 12377 cat << \EOF > conftest.java
12391// #line 12391 "configure" 12378// #line 12378 "configure"
12392import org.flexdock.docking.DockingManager; 12379import org.flexdock.docking.DockingManager;
12393 12380
12394public class conftest { 12381public class conftest {
@@ -12482,7 +12469,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
12482 if test "x" == "x"; then 12469 if test "x" == "x"; then
12483 12470
12484 cat << \EOF > conftest.java 12471 cat << \EOF > conftest.java
12485// #line 12485 "configure" 12472// #line 12472 "configure"
12486import org.flexdock.util.Utilities; 12473import org.flexdock.util.Utilities;
12487 12474
12488public class conftest { 12475public class conftest {
@@ -12533,7 +12520,7 @@ EOF
12533 else 12520 else
12534 12521
12535 cat << \EOF > conftest.java 12522 cat << \EOF > conftest.java
12536// #line 12536 "configure" 12523// #line 12523 "configure"
12537import org.flexdock.util.Utilities; 12524import org.flexdock.util.Utilities;
12538 12525
12539public class conftest { 12526public class conftest {
@@ -12606,7 +12593,7 @@ $as_echo_n "checking looks... " >&6; }
12606 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12593 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12607 12594
12608 cat << \EOF > conftest.java 12595 cat << \EOF > conftest.java
12609// #line 12609 "configure" 12596// #line 12596 "configure"
12610import com.jgoodies.looks.common.MenuItemRenderer; 12597import com.jgoodies.looks.common.MenuItemRenderer;
12611 12598
12612public class conftest { 12599public class conftest {
@@ -12713,7 +12700,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
12713 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12700 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12714 12701
12715 cat << \EOF > conftest.java 12702 cat << \EOF > conftest.java
12716// #line 12716 "configure" 12703// #line 12703 "configure"
12717import com.jgoodies.looks.common.MenuItemRenderer; 12704import com.jgoodies.looks.common.MenuItemRenderer;
12718 12705
12719public class conftest { 12706public class conftest {
@@ -12821,7 +12808,7 @@ $as_echo_n "checking skinlf... " >&6; }
12821 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12808 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12822 12809
12823 cat << \EOF > conftest.java 12810 cat << \EOF > conftest.java
12824// #line 12824 "configure" 12811// #line 12811 "configure"
12825import com.l2fprod.util.AccessUtils; 12812import com.l2fprod.util.AccessUtils;
12826 12813
12827public class conftest { 12814public class conftest {
@@ -12928,7 +12915,7 @@ $as_echo_n "checking jogl... " >&6; }
12928 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12915 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12929 12916
12930 cat << \EOF > conftest.java 12917 cat << \EOF > conftest.java
12931// #line 12931 "configure" 12918// #line 12918 "configure"
12932import javax.media.opengl.glu.GLUnurbs; 12919import javax.media.opengl.glu.GLUnurbs;
12933 12920
12934public class conftest { 12921public class conftest {
@@ -13142,7 +13129,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
13142 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13129 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13143 13130
13144 cat << \EOF > conftest.java 13131 cat << \EOF > conftest.java
13145// #line 13145 "configure" 13132// #line 13132 "configure"
13146import com.sun.gluegen.runtime.CPU; 13133import com.sun.gluegen.runtime.CPU;
13147 13134
13148public class conftest { 13135public class conftest {
@@ -13305,7 +13292,7 @@ $as_echo_n "checking jhall... " >&6; }
13305 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13292 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13306 13293
13307 cat << \EOF > conftest.java 13294 cat << \EOF > conftest.java
13308// #line 13308 "configure" 13295// #line 13295 "configure"
13309import javax.help.JHelp; 13296import javax.help.JHelp;
13310 13297
13311public class conftest { 13298public class conftest {
@@ -13412,7 +13399,7 @@ $as_echo_n "checking javahelp2... " >&6; }
13412 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13399 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13413 13400
13414 cat << \EOF > conftest.java 13401 cat << \EOF > conftest.java
13415// #line 13415 "configure" 13402// #line 13402 "configure"
13416import javax.help.JHelp; 13403import javax.help.JHelp;
13417 13404
13418public class conftest { 13405public class conftest {
@@ -13520,7 +13507,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
13520 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13507 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13521 13508
13522 cat << \EOF > conftest.java 13509 cat << \EOF > conftest.java
13523// #line 13523 "configure" 13510// #line 13510 "configure"
13524import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 13511import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
13525 13512
13526public class conftest { 13513public class conftest {
@@ -13627,7 +13614,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
13627 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13614 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13628 13615
13629 cat << \EOF > conftest.java 13616 cat << \EOF > conftest.java
13630// #line 13630 "configure" 13617// #line 13617 "configure"
13631import com.artenum.rosetta.core.action.AbstractConsoleAction; 13618import com.artenum.rosetta.core.action.AbstractConsoleAction;
13632 13619
13633public class conftest { 13620public class conftest {
@@ -13736,7 +13723,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
13736 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13723 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13737 13724
13738 cat << \EOF > conftest.java 13725 cat << \EOF > conftest.java
13739// #line 13739 "configure" 13726// #line 13726 "configure"
13740import net.sourceforge.jeuclid.LayoutContext; 13727import net.sourceforge.jeuclid.LayoutContext;
13741 13728
13742public class conftest { 13729public class conftest {
@@ -13845,7 +13832,7 @@ $as_echo_n "checking fop... " >&6; }
13845 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13832 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13846 13833
13847 cat << \EOF > conftest.java 13834 cat << \EOF > conftest.java
13848// #line 13848 "configure" 13835// #line 13835 "configure"
13849import org.apache.fop.pdf.PDFInfo; 13836import org.apache.fop.pdf.PDFInfo;
13850 13837
13851public class conftest { 13838public class conftest {
@@ -13952,7 +13939,7 @@ $as_echo_n "checking batik-all... " >&6; }
13952 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13939 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13953 13940
13954 cat << \EOF > conftest.java 13941 cat << \EOF > conftest.java
13955// #line 13955 "configure" 13942// #line 13942 "configure"
13956import org.apache.batik.parser.Parser; 13943import org.apache.batik.parser.Parser;
13957 13944
13958public class conftest { 13945public class conftest {
@@ -14059,7 +14046,7 @@ $as_echo_n "checking batik... " >&6; }
14059 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14046 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14060 14047
14061 cat << \EOF > conftest.java 14048 cat << \EOF > conftest.java
14062// #line 14062 "configure" 14049// #line 14049 "configure"
14063import org.apache.batik.parser.Parser; 14050import org.apache.batik.parser.Parser;
14064 14051
14065public class conftest { 14052public class conftest {
@@ -14153,7 +14140,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
14153 if test "x" == "x"; then 14140 if test "x" == "x"; then
14154 14141
14155 cat << \EOF > conftest.java 14142 cat << \EOF > conftest.java
14156// #line 14156 "configure" 14143// #line 14143 "configure"
14157import org.apache.batik.Version; 14144import org.apache.batik.Version;
14158 14145
14159public class conftest { 14146public class conftest {
@@ -14204,7 +14191,7 @@ EOF
14204 else 14191 else
14205 14192
14206 cat << \EOF > conftest.java 14193 cat << \EOF > conftest.java
14207// #line 14207 "configure" 14194// #line 14194 "configure"
14208import org.apache.batik.Version; 14195import org.apache.batik.Version;
14209 14196
14210public class conftest { 14197public class conftest {
@@ -14277,7 +14264,7 @@ $as_echo_n "checking commons-io... " >&6; }
14277 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14264 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14278 14265
14279 cat << \EOF > conftest.java 14266 cat << \EOF > conftest.java
14280// #line 14280 "configure" 14267// #line 14267 "configure"
14281import org.apache.commons.io.output.CountingOutputStream; 14268import org.apache.commons.io.output.CountingOutputStream;
14282 14269
14283public class conftest { 14270public class conftest {
@@ -14384,7 +14371,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
14384 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14371 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14385 14372
14386 cat << \EOF > conftest.java 14373 cat << \EOF > conftest.java
14387// #line 14387 "configure" 14374// #line 14374 "configure"
14388import org.apache.xmlgraphics.util.Service; 14375import org.apache.xmlgraphics.util.Service;
14389 14376
14390public class conftest { 14377public class conftest {
@@ -14491,7 +14478,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
14491 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14478 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14492 14479
14493 cat << \EOF > conftest.java 14480 cat << \EOF > conftest.java
14494// #line 14494 "configure" 14481// #line 14481 "configure"
14495import org.apache.avalon.framework.configuration.ConfigurationException; 14482import org.apache.avalon.framework.configuration.ConfigurationException;
14496 14483
14497public class conftest { 14484public class conftest {
@@ -14598,7 +14585,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
14598 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14585 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14599 14586
14600 cat << \EOF > conftest.java 14587 cat << \EOF > conftest.java
14601// #line 14601 "configure" 14588// #line 14588 "configure"
14602import org.w3c.dom.svg.SVGDocument; 14589import org.w3c.dom.svg.SVGDocument;
14603 14590
14604public class conftest { 14591public class conftest {
@@ -14705,7 +14692,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
14705 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14692 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14706 14693
14707 cat << \EOF > conftest.java 14694 cat << \EOF > conftest.java
14708// #line 14708 "configure" 14695// #line 14695 "configure"
14709import org.w3c.dom.svg.SVGDocument; 14696import org.w3c.dom.svg.SVGDocument;
14710 14697
14711public class conftest { 14698public class conftest {
@@ -14816,7 +14803,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14816 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14803 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14817 14804
14818 cat << \EOF > conftest.java 14805 cat << \EOF > conftest.java
14819// #line 14819 "configure" 14806// #line 14806 "configure"
14820import org.apache.commons.logging.LogFactory; 14807import org.apache.commons.logging.LogFactory;
14821 14808
14822public class conftest { 14809public class conftest {
@@ -14923,7 +14910,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
14923 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14910 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14924 14911
14925 cat << \EOF > conftest.java 14912 cat << \EOF > conftest.java
14926// #line 14926 "configure" 14913// #line 14913 "configure"
14927import org.scilab.forge.jlatexmath.TeXFormula; 14914import org.scilab.forge.jlatexmath.TeXFormula;
14928 14915
14929public class conftest { 14916public class conftest {
@@ -15017,7 +15004,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
15017 if test "x" == "x"; then 15004 if test "x" == "x"; then
15018 15005
15019 cat << \EOF > conftest.java 15006 cat << \EOF > conftest.java
15020// #line 15020 "configure" 15007// #line 15007 "configure"
15021import org.scilab.forge.jlatexmath.TeXFormula; 15008import org.scilab.forge.jlatexmath.TeXFormula;
15022 15009
15023public class conftest { 15010public class conftest {
@@ -15068,7 +15055,7 @@ EOF
15068 else 15055 else
15069 15056
15070 cat << \EOF > conftest.java 15057 cat << \EOF > conftest.java
15071// #line 15071 "configure" 15058// #line 15058 "configure"
15072import org.scilab.forge.jlatexmath.TeXFormula; 15059import org.scilab.forge.jlatexmath.TeXFormula;
15073 15060
15074public class conftest { 15061public class conftest {
@@ -15147,7 +15134,7 @@ $as_echo_n "checking checkstyle... " >&6; }
15147 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15134 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15148 15135
15149 cat << \EOF > conftest.java 15136 cat << \EOF > conftest.java
15150// #line 15150 "configure" 15137// #line 15137 "configure"
15151import com.puppycrawl.tools.checkstyle.CheckStyleTask; 15138import com.puppycrawl.tools.checkstyle.CheckStyleTask;
15152 15139
15153public class conftest { 15140public class conftest {
@@ -15254,7 +15241,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
15254 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15241 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15255 15242
15256 cat << \EOF > conftest.java 15243 cat << \EOF > conftest.java
15257// #line 15257 "configure" 15244// #line 15244 "configure"
15258import org.apache.commons.beanutils.Converter; 15245import org.apache.commons.beanutils.Converter;
15259 15246
15260public class conftest { 15247public class conftest {
@@ -15361,7 +15348,7 @@ $as_echo_n "checking antlr... " >&6; }
15361 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15348 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15362 15349
15363 cat << \EOF > conftest.java 15350 cat << \EOF > conftest.java
15364// #line 15364 "configure" 15351// #line 15351 "configure"
15365import antlr.TokenStreamException; 15352import antlr.TokenStreamException;
15366 15353
15367public class conftest { 15354public class conftest {
@@ -15468,7 +15455,7 @@ $as_echo_n "checking testng... " >&6; }
15468 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15455 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15469 15456
15470 cat << \EOF > conftest.java 15457 cat << \EOF > conftest.java
15471// #line 15471 "configure" 15458// #line 15458 "configure"
15472import org.testng.TestNG; 15459import org.testng.TestNG;
15473 15460
15474public class conftest { 15461public class conftest {
@@ -15575,7 +15562,7 @@ $as_echo_n "checking qdox... " >&6; }
15575 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15562 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15576 15563
15577 cat << \EOF > conftest.java 15564 cat << \EOF > conftest.java
15578// #line 15578 "configure" 15565// #line 15565 "configure"
15579import com.thoughtworks.qdox.tools.QDoxTester; 15566import com.thoughtworks.qdox.tools.QDoxTester;
15580 15567
15581public class conftest { 15568public class conftest {
@@ -15682,7 +15669,7 @@ $as_echo_n "checking bsh... " >&6; }
15682 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15669 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15683 15670
15684 cat << \EOF > conftest.java 15671 cat << \EOF > conftest.java
15685// #line 15685 "configure" 15672// #line 15672 "configure"
15686import bsh.Console; 15673import bsh.Console;
15687 15674
15688public class conftest { 15675public class conftest {
@@ -15789,7 +15776,7 @@ $as_echo_n "checking junit... " >&6; }
15789 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15776 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15790 15777
15791 cat << \EOF > conftest.java 15778 cat << \EOF > conftest.java
15792// #line 15792 "configure" 15779// #line 15779 "configure"
15793import junit.framework.Assert; 15780import junit.framework.Assert;
15794 15781
15795public class conftest { 15782public class conftest {
@@ -19675,519 +19662,6 @@ fi
19675#AM_CONDITIONAL(MPI, test "$with_mpi" = yes) 19662#AM_CONDITIONAL(MPI, test "$with_mpi" = yes)
19676 19663
19677################# 19664#################
19678## PVM
19679#################
19680
19681
19682# Check whether --with-pvm was given.
19683if test "${with_pvm+set}" = set; then :
19684 withval=$with_pvm;
19685fi
19686
19687
19688PVM_ENABLE=no
19689if test "$with_pvm" != no; then
19690
19691
19692 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PVM_ROOT has been set" >&5
19693$as_echo_n "checking if PVM_ROOT has been set... " >&6; }
19694 if test "x$PVM_ROOT" = "x"; then
19695 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. I will try to guess a value for it" >&5
19696$as_echo "no. I will try to guess a value for it" >&6; }
19697 _pvm_path="${PATH}"
19698 # this variable will be used later to see if the user specified
19699 # PVM_ROOT or if we guessed at it based on the location of the
19700 # header
19701 _pvm_root_specified=no
19702 else
19703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($PVM_ROOT)" >&5
19704$as_echo "yes ($PVM_ROOT)" >&6; }
19705
19706 _pvm_root_specified=yes
19707 # PVM_ROOT is set, make sure the directory exists
19708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the specified PVM_ROOT directory exists" >&5
19709$as_echo_n "checking if the specified PVM_ROOT directory exists... " >&6; }
19710 if test -d "$PVM_ROOT" ; then
19711 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19712$as_echo "yes" >&6; }
19713 else
19714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19715$as_echo "no" >&6; }
19716 as_fn_error $? "The directory specified by PVM_ROOT does not exist.
19717The value of PVM_ROOT must either be left unspecified (empty or not defined)
19718or set to a valid directory that is the root of a pvm3 installation.
19719" "$LINENO" 5
19720 fi
19721
19722 # PVM_ROOT is set and the directory exists. Now make sure it looks
19723 # like a pvm installation!
19724 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the specified PVM_ROOT contains a pvm installation" >&5
19725$as_echo_n "checking if the specified PVM_ROOT contains a pvm installation... " >&6; }
19726 if test -r "${PVM_ROOT}/include/pvm3.h" ; then
19727 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19728$as_echo "yes" >&6; }
19729 else
19730 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19731$as_echo "no" >&6; }
19732 as_fn_error $? "The directory specified by PVM_ROOT does not appear
19733to be a valid pvm installation directory. This is based on PVM_ROOT/include/pvm3.h
19734not existing. The value of PVM_ROOT must either be left unspecified (empty or
19735not defined) or set to a valid directory that is the root of a pvm3 installation." "$LINENO" 5
19736 fi
19737
19738 # If we made it this far then it means PVM_ROOT is set and appears to
19739 # be valid.
19740 # we'll use this path for looking for pvmgetarch.
19741 _pvm_path="${PVM_ROOT}/lib:${PATH}"
19742 fi
19743
19744 # check for pvmgetarch. If specified then PVM_ROOT/lib is placed at the
19745 # beginning of the search path. The user can force this by
19746 # simply setting PVMGETARCH on the configure command line like
19747 # PVMGETARCH=/path/to/pvmgetarch if they need to force a particular value.
19748 # Extract the first word of "pvmgetarch", so it can be a program name with args.
19749set dummy pvmgetarch; ac_word=$2
19750{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19751$as_echo_n "checking for $ac_word... " >&6; }
19752if test "${ac_cv_path_PVMGETARCH+set}" = set; then :
19753 $as_echo_n "(cached) " >&6
19754else
19755 case $PVMGETARCH in
19756 [\\/]* | ?:[\\/]*)
19757 ac_cv_path_PVMGETARCH="$PVMGETARCH" # Let the user override the test with a path.
19758 ;;
19759 *)
19760 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19761for as_dir in $_pvm_path
19762do
19763 IFS=$as_save_IFS
19764 test -z "$as_dir" && as_dir=.
19765 for ac_exec_ext in '' $ac_executable_extensions; do
19766 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19767 ac_cv_path_PVMGETARCH="$as_dir/$ac_word$ac_exec_ext"
19768 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19769 break 2
19770 fi
19771done
19772 done
19773IFS=$as_save_IFS
19774
19775 test -z "$ac_cv_path_PVMGETARCH" && ac_cv_path_PVMGETARCH="no"
19776 ;;
19777esac
19778fi
19779PVMGETARCH=$ac_cv_path_PVMGETARCH
19780if test -n "$PVMGETARCH"; then
19781 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PVMGETARCH" >&5
19782$as_echo "$PVMGETARCH" >&6; }
19783else
19784 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19785$as_echo "no" >&6; }
19786fi
19787
19788
19789
19790 if test "$PVMGETARCH" = "no" ; then
19791 as_fn_error $? "Unable to find pvmgetarch in PVM_ROOT/lib or PATH" "$LINENO" 5
19792 fi
19793
19794
19795 # FIXME -- if we ever wish to cross compile scilab with pvm support in place
19796 # then the user will need o specify PVM_ARCH correctly. See pvm_intro(1PVM) for
19797 # more details on the supported environment variables.
19798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PVM architecture" >&5
19799$as_echo_n "checking for PVM architecture... " >&6; }
19800if test "${PVM_ARCH+set}" = set; then :
19801 $as_echo_n "(cached) " >&6
19802else
19803 PVM_ARCH=`$PVMGETARCH`
19804fi
19805{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PVM_ARCH" >&5
19806$as_echo "$PVM_ARCH" >&6; }
19807 if test "x$PVM_ARCH" = "xUNKNOWN"; then
19808 as_fn_error $? "PVM is unable to recognise the architecture. This means that
19809pvmgetarch ($PVMGETARCH) is broken on your system.
19810" "$LINENO" 5
19811 fi
19812
19813
19814 # now we start looking for the pvm3.h header.
19815 USER_PVMINCLUDE=""
19816
19817# Check whether --with-pvm-include was given.
19818if test "${with_pvm_include+set}" = set; then :
19819 withval=$with_pvm_include; USER_PVMINCLUDE=$withval
19820
19821fi
19822
19823
19824
19825 { $as_echo "$as_me:${as_lineno-$LINENO}: checking PVM header files" >&5
19826$as_echo_n "checking PVM header files... " >&6; }
19827 USER_PVMINCLUDE="$USER_PVMINCLUDE"
19828
19829 _pvm_header=pvm3.h
19830 # if the user has given a --with-pvm-include configure option but the specified
19831 # directory does not exist, then error out. We don't keep searching in this case
19832 # because the user has explicitly told us where to look and that location didn't
19833 # exist.
19834 if test "x$USER_PVMINCLUDE" != "x" -a ! -d "$USER_PVMINCLUDE" ; then
19835 as_fn_error $? "The specified PVM include directory, $USER_PVMINCLUDE, does not exist." "$LINENO" 5
19836 fi
19837
19838 if test "x$USER_PVMINCLUDE" != "x" ; then
19839 # if the user has given a --with-pvm-include configure option but there is no pvm3.h
19840 # there then error out. We don't keep searching in this case because the user has
19841 # explicitly told us where to look but we didn't find what we needed there.
19842 if test -f "$USER_PVMINCLUDE/${_pvm_header}" ; then
19843 PVM_INCLUDE_DIR="$USER_PVMINCLUDE"
19844 else
19845 as_fn_error $? "Cannot find PVM header (${_pvm_header}) in the specified directory ($USER_PVMINCLUDE)." "$LINENO" 5
19846 fi
19847 else
19848 # we have not been given a --with-pvm-include option, so we have to go looking
19849 # for the pvm header
19850 incpath=""
19851
19852 # if PVM_ROOT is set, then look there first
19853 if test "x$PVM_ROOT" != "x" ; then
19854 incpath="$PVM_ROOT/include $incpath"
19855 else
19856 # PVM_ROOT is not set so lets take a guess at what it may be.
19857 # pvmgetarch is supposed to be installed as PVM_ROOT/lib/pvmgetarch
19858 # so dirname $PVMGETARCH should give PVM_ROOT/lib
19859 # and dirname again should give a guess at PVM_ROOT
19860 tmp=`dirname $PVMGETARCH`
19861 tmp=`dirname $tmp`
19862 incpath="${tmp}/include $incpath"
19863 fi
19864
19865 # add a bunch of other paths
19866 incpath="$incpath /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src"
19867 PVM_INCLUDE=""
19868 for INC_PATH in $incpath; do
19869 F="$INC_PATH/${_pvm_header}"
19870 if test -f "$F"; then
19871 PVM_INCLUDE_DIR="${INC_PATH}"
19872 break 1;
19873 fi
19874 done
19875 if test -z "$PVM_INCLUDE_DIR"; then
19876 as_fn_error $? "Could not locate PVM include file (${_pvm_header})" "$LINENO" 5
19877 fi
19878 fi
19879 { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVM header found in $PVM_INCLUDE_DIR" >&5
19880$as_echo "PVM header found in $PVM_INCLUDE_DIR" >&6; }
19881
19882 ac_save_CPPFLAGS="$CPPFLAGS"
19883 ac_save_CFLAGS="$CFLAGS"
19884
19885 CPPFLAGS="-I$PVM_INCLUDE_DIR $CPPFLAGS"
19886 CFLAGS="-I$PVM_INCLUDE_DIR $CFLAGS"
19887
19888 ac_fn_c_check_header_mongrel "$LINENO" "pvm3.h" "ac_cv_header_pvm3_h" "$ac_includes_default"
19889if test "x$ac_cv_header_pvm3_h" = x""yes; then :
19890
19891else
19892 as_fn_error $? "check for PVM headers failed" "$LINENO" 5
19893fi
19894
19895
19896
19897 CPPFLAGS=$ac_save_CPPFLAGS
19898 CFLAGS=$ac_save_CFLAGS
19899 PVM_INCLUDE="-I${PVM_INCLUDE_DIR}"
19900
19901
19902
19903$as_echo "#define WITH_PVM /**/" >>confdefs.h
19904
19905
19906 if test "x$PVM_ROOT" = "x" ; then
19907 # PVM_ROOT was not set so try to guess it from the header location.
19908 # Since if we made it this far, we must have found the pvm3.h header
19909 # somewhere and that somewhere is in $PVM_INCLUDE_DIR.
19910 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a reasonable guess at PVM_ROOT since PVM_ROOT was not set" >&5
19911$as_echo_n "checking for a reasonable guess at PVM_ROOT since PVM_ROOT was not set... " >&6; }
19912 PVM_ROOT="`dirname $PVM_INCLUDE_DIR`"
19913 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PVM_ROOT" >&5
19914$as_echo "$PVM_ROOT" >&6; }
19915 fi
19916
19917 PVMLIBDIR=$PVM_ROOT/lib/$PVM_ARCH
19918 USER_PVMLIBDIR=""
19919
19920# Check whether --with-pvm-library was given.
19921if test "${with_pvm_library+set}" = set; then :
19922 withval=$with_pvm_library; USER_PVMLIBDIR=$withval
19923
19924fi
19925
19926
19927 USER_PVMLIBDIR="$USER_PVMLIBDIR"
19928
19929 # if the user has given a --with-pvm-library configure option but the specified
19930 # directory does not exist, then error out. We don't keep searching in this case
19931 # because the user has explicitly told us where to look and that location did not
19932 # exist.
19933 if test "x$USER_PVMLIBDIR" != "x" ; then
19934 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the specified PVM library directory ($USER_PVMLIBDIR) exists" >&5
19935$as_echo_n "checking if the specified PVM library directory ($USER_PVMLIBDIR) exists... " >&6; }
19936 if test -d "$USER_PVMLIBDIR" ; then
19937 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19938$as_echo "yes" >&6; }
19939 else
19940 as_fn_error $? "The specified PVM library directory ($USER_PVMLIBDIR) does not exist.
19941When specifying a PVM library directory with --with-pvm-libraries, the directory must
19942exist and contain PVM libraries" "$LINENO" 5
19943 fi
19944 fi
19945
19946
19947 dirs="$USER_PVMLIBDIR $PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 ."
19948 libnames="pvm3 pvm"
19949
19950
19951 # if the user has given a --with-pvm-library configure option, only look there.
19952 if test "x$USER_PVMLIBDIR" != "x" ; then
19953 dirs="$USER_PVMLIBDIR"
19954 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PVM libraries in $USER_PVMLIBDIR" >&5
19955$as_echo_n "checking for PVM libraries in $USER_PVMLIBDIR... " >&6; }
19956 elif test "$_pvm_root_specified" = "yes" ; then
19957 # otherwise, if the user has specified PVM_ROOT (as opposed to configure
19958 # having guessed it), then only look in PVMLIBDIR (derived from PVM_ROOT
19959 # and PVMGETARCH output
19960 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PVM libraries in $PVMLIBDIR" >&5
19961$as_echo_n "checking for PVM libraries in $PVMLIBDIR... " >&6; }
19962 dirs="$PVMLIBDIR"
19963 else
19964 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PVM libraries" >&5
19965$as_echo_n "checking for PVM libraries... " >&6; }
19966 fi
19967
19968 # put the path loop on the outside because we always want to look in
19969 # the user specified directory and the PVM_ROOT directory first for all possible
19970 # names instead of accidentally picking up something from a different directory
19971 for PATH_LIB_PVM in $dirs; do
19972 for NAME_LIB_PVM in $libnames; do
19973 m=lib${NAME_LIB_PVM}
19974 # note that the * is outside the quotes to allow the shell to expand it.
19975 # The rest is quoted in case we have spaces or anything weird in the path.
19976 ls "${PATH_LIB_PVM}/${m}."* >/dev/null 2>/dev/null
19977 rc=$?
19978 if test $rc -eq 0 ; then
19979 # we found a candidate directory
19980 # so check it out and see if it works
19981 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $m in $PATH_LIB_PVM" >&5
19982$as_echo "found $m in $PATH_LIB_PVM" >&6; }
19983 saved_cflags="$CFLAGS"
19984 saved_ldflags="$LDFLAGS"
19985 saved_cppflags="$CPPFLAGS"
19986 saved_libs="$LIBS"
19987 CFLAGS="$PVM_INCLUDE $CFLAGS"
19988 CPPFLAGS="$PVM_INCLUDE $CPPFLAGS"
19989 LDFLAGS="$LDFLAGS -L$PATH_LIB_PVM"
19990
19991 # pvm_spawn() is a basic pvm3 function and should be in libpvm3
19992 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pvm_spawn" >&5
19993$as_echo_n "checking for library containing pvm_spawn... " >&6; }
19994if test "${ac_cv_search_pvm_spawn+set}" = set; then :
19995 $as_echo_n "(cached) " >&6
19996else
19997 ac_func_search_save_LIBS=$LIBS
19998cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19999/* end confdefs.h. */
20000
20001/* Override any GCC internal prototype to avoid an error.
20002 Use char because int might match the return type of a GCC
20003 builtin and then its argument prototype would still apply. */
20004#ifdef __cplusplus
20005extern "C"
20006#endif
20007char pvm_spawn ();
20008int
20009main ()
20010{
20011return pvm_spawn ();
20012 ;
20013 return 0;
20014}
20015_ACEOF
20016for ac_lib in '' pvm3 pvm; do
20017 if test -z "$ac_lib"; then
20018 ac_res="none required"
20019 else
20020 ac_res=-l$ac_lib
20021 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
20022 fi
20023 if ac_fn_c_try_link "$LINENO"; then :
20024 ac_cv_search_pvm_spawn=$ac_res
20025fi
20026rm -f core conftest.err conftest.$ac_objext \
20027 conftest$ac_exeext
20028 if test "${ac_cv_search_pvm_spawn+set}" = set; then :
20029 break
20030fi
20031done
20032if test "${ac_cv_search_pvm_spawn+set}" = set; then :
20033
20034else
20035 ac_cv_search_pvm_spawn=no
20036fi
20037rm conftest.$ac_ext
20038LIBS=$ac_func_search_save_LIBS
20039fi
20040{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pvm_spawn" >&5
20041$as_echo "$ac_cv_search_pvm_spawn" >&6; }
20042ac_res=$ac_cv_search_pvm_spawn
20043if test "$ac_res" != no; then :
20044 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
20045 PVM_SPAWN=$ac_res
20046else
20047 as_fn_error $? "Could not find the library with pvm_spawn(). Check that your PVM installation is not broken" "$LINENO" 5
20048
20049fi
20050
20051
20052 if test "$PVM_SPAWN" = "none required" ; then
20053 PVM_SPAWN=""
20054 fi
20055
20056 # pvm_barrier() is one of the group functions and should be in libgpvm3
20057 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pvm_barrier" >&5
20058$as_echo_n "checking for library containing pvm_barrier... " >&6; }
20059if test "${ac_cv_search_pvm_barrier+set}" = set; then :
20060 $as_echo_n "(cached) " >&6
20061else
20062 ac_func_search_save_LIBS=$LIBS
20063cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20064/* end confdefs.h. */
20065
20066/* Override any GCC internal prototype to avoid an error.
20067 Use char because int might match the return type of a GCC
20068 builtin and then its argument prototype would still apply. */
20069#ifdef __cplusplus
20070extern "C"
20071#endif
20072char pvm_barrier ();
20073int
20074main ()
20075{
20076return pvm_barrier ();
20077 ;
20078 return 0;
20079}
20080_ACEOF
20081for ac_lib in '' pvm3 gpvm3; do
20082 if test -z "$ac_lib"; then
20083 ac_res="none required"
20084 else
20085 ac_res=-l$ac_lib
20086 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
20087 fi
20088 if ac_fn_c_try_link "$LINENO"; then :
20089 ac_cv_search_pvm_barrier=$ac_res
20090fi
20091rm -f core conftest.err conftest.$ac_objext \
20092 conftest$ac_exeext
20093 if test "${ac_cv_search_pvm_barrier+set}" = set; then :
20094 break
20095fi
20096done
20097if test "${ac_cv_search_pvm_barrier+set}" = set; then :
20098
20099else
20100 ac_cv_search_pvm_barrier=no
20101fi
20102rm conftest.$ac_ext
20103LIBS=$ac_func_search_save_LIBS
20104fi
20105{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pvm_barrier" >&5
20106$as_echo "$ac_cv_search_pvm_barrier" >&6; }
20107ac_res=$ac_cv_search_pvm_barrier
20108if test "$ac_res" != no; then :
20109 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
20110 PVM_BARRIER=$ac_res
20111else
20112 as_fn_error $? "Could not find the library with pvm_barrier(). Check that your PVM installation is not broken" "$LINENO" 5
20113
20114fi
20115
20116
20117 if test "$PVM_BARRIER" = "none required" ; then
20118 PVM_BARRIER=""
20119 fi
20120
20121 PVMLIBS="$PVM_SPAWN $PVM_BARRIER"
20122 PVM_LIB_OK=1
20123
20124 CFLAGS="$saved_cflags"
20125 CPPFLAGS="$saved_cppflags"
20126 LDFLAGS="$saved_ldflags"
20127 LIBS="$saved_libs"
20128
20129 if test $PVM_LIB_OK = 1; then
20130 PVM_LIB="-L$PATH_LIB_PVM $PVMLIBS"
20131 break 2;
20132 fi
20133 fi
20134 done # end of libname loop
20135 done # end of directory loop
20136
20137
20138# if we didn't find the PVM library, then spit out an error message
20139# about it. The error message is customized based on if the user
20140# has specified PVM_ROOT or --with-pvm-libraries
20141if test -z "$PVM_LIB"; then
20142
20143 if test "x$USER_PVMLIBDIR" != "x" ; then
20144
20145 as_fn_error $? "could not locate PVM libraries in the directory
20146specified by --with-pvm-libraries ($USER_PVMLIBDIR)" "$LINENO" 5
20147
20148 elif test "$_pvm_root_specified" = "yes" ; then
20149
20150 as_fn_error $? "could not locate PVM libraries by way of
20151PVM_ROOT/lib/<PVM_ARCH> ($PVMLIBDIR). Either correct your PVM
20152installation, PVM_ROOT, or use the --with-pvm-libraries configure
20153option if your pvm libraries are installed in a non-standard
20154location." "$LINENO" 5
20155
20156 else
20157
20158 as_fn_error $? "check for PVM library failed. You may wish
20159to try setting PVM_ROOT to the root of your PVM installation or use
20160the --with-pvm-libraries option to specify the directory containing
20161the PVM library." "$LINENO" 5
20162 fi
20163fi
20164
20165
20166
20167
20168 if test ! -z "$PVM_INCLUDE" -a ! -z "$PVM_LIB"; then
20169 PVM_OK=1
20170 else
20171 as_fn_error $? "Cannot find headers (pvm3.h) or PVM library. Please install the dev package for pvm3." "$LINENO" 5
20172 fi
20173
20174
20175
20176
20177 PVM_ENABLE=yes
20178fi
20179
20180
20181 if test "$with_pvm" != no; then
20182 PVM_TRUE=
20183 PVM_FALSE='#'
20184else
20185 PVM_TRUE='#'
20186 PVM_FALSE=
20187fi
20188
20189
20190#################
20191## OpenMP 19665## OpenMP
20192################# 19666#################
20193 19667
@@ -23826,7 +23300,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
23826{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 23300{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
23827$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 23301$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
23828cat > conftest.$ac_ext <<EOF 23302cat > conftest.$ac_ext <<EOF
23829#line 23829 "configure" 23303#line 23303 "configure"
23830#include "confdefs.h" 23304#include "confdefs.h"
23831 23305
23832#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 23306#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24136,7 +23610,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
24136$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 23610$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
24137 23611
24138cat > conftest.$ac_ext <<EOF 23612cat > conftest.$ac_ext <<EOF
24139#line 24139 "configure" 23613#line 23613 "configure"
24140#include "confdefs.h" 23614#include "confdefs.h"
24141 23615
24142#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 23616#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -24717,7 +24191,7 @@ $as_echo_n "checking saxon... " >&6; }
24717 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24191 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24718 24192
24719 cat << \EOF > conftest.java 24193 cat << \EOF > conftest.java
24720// #line 24720 "configure" 24194// #line 24194 "configure"
24721import com.icl.saxon.Loader; 24195import com.icl.saxon.Loader;
24722 24196
24723public class conftest { 24197public class conftest {
@@ -24824,7 +24298,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
24824 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24298 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24825 24299
24826 cat << \EOF > conftest.java 24300 cat << \EOF > conftest.java
24827// #line 24827 "configure" 24301// #line 24301 "configure"
24828import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 24302import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
24829 24303
24830public class conftest { 24304public class conftest {
@@ -31131,7 +30605,7 @@ else
31131 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30605 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31132 lt_status=$lt_dlunknown 30606 lt_status=$lt_dlunknown
31133 cat > conftest.$ac_ext <<_LT_EOF 30607 cat > conftest.$ac_ext <<_LT_EOF
31134#line 31134 "configure" 30608#line 30608 "configure"
31135#include "confdefs.h" 30609#include "confdefs.h"
31136 30610
31137#if HAVE_DLFCN_H 30611#if HAVE_DLFCN_H
@@ -31237,7 +30711,7 @@ else
31237 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30711 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31238 lt_status=$lt_dlunknown 30712 lt_status=$lt_dlunknown
31239 cat > conftest.$ac_ext <<_LT_EOF 30713 cat > conftest.$ac_ext <<_LT_EOF
31240#line 31240 "configure" 30714#line 30714 "configure"
31241#include "confdefs.h" 30715#include "confdefs.h"
31242 30716
31243#if HAVE_DLFCN_H 30717#if HAVE_DLFCN_H
@@ -37364,7 +36838,7 @@ if test "$enable_stop_on_warning" = yes; then
37364 CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0" 36838 CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
37365fi 36839fi
37366 36840
37367ac_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/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/types/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/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h" 36841ac_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/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/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/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
37368 36842
37369 36843
37370# Detection of the module for the future version of Scilab 6 36844# Detection of the module for the future version of Scilab 6
@@ -37594,10 +37068,6 @@ if test -z "${FFTW_TRUE}" && test -z "${FFTW_FALSE}"; then
37594 as_fn_error $? "conditional \"FFTW\" was never defined. 37068 as_fn_error $? "conditional \"FFTW\" was never defined.
37595Usually this means the macro was only invoked conditionally." "$LINENO" 5 37069Usually this means the macro was only invoked conditionally." "$LINENO" 5
37596fi 37070fi
37597if test -z "${PVM_TRUE}" && test -z "${PVM_FALSE}"; then
37598 as_fn_error $? "conditional \"PVM\" was never defined.
37599Usually this means the macro was only invoked conditionally." "$LINENO" 5
37600fi
37601if test -z "${OPENMP_TRUE}" && test -z "${OPENMP_FALSE}"; then 37071if test -z "${OPENMP_TRUE}" && test -z "${OPENMP_FALSE}"; then
37602 as_fn_error $? "conditional \"OPENMP\" was never defined. 37072 as_fn_error $? "conditional \"OPENMP\" was never defined.
37603Usually this means the macro was only invoked conditionally." "$LINENO" 5 37073Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -38743,7 +38213,6 @@ do
38743 "modules/renderer/Makefile") CONFIG_FILES="$CONFIG_FILES modules/renderer/Makefile" ;; 38213 "modules/renderer/Makefile") CONFIG_FILES="$CONFIG_FILES modules/renderer/Makefile" ;;
38744 "modules/action_binding/Makefile") CONFIG_FILES="$CONFIG_FILES modules/action_binding/Makefile" ;; 38214 "modules/action_binding/Makefile") CONFIG_FILES="$CONFIG_FILES modules/action_binding/Makefile" ;;
38745 "modules/gui/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gui/Makefile" ;; 38215 "modules/gui/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gui/Makefile" ;;
38746 "modules/pvm/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pvm/Makefile" ;;
38747 "modules/randlib/Makefile") CONFIG_FILES="$CONFIG_FILES modules/randlib/Makefile" ;; 38216 "modules/randlib/Makefile") CONFIG_FILES="$CONFIG_FILES modules/randlib/Makefile" ;;
38748 "modules/tclsci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/tclsci/Makefile" ;; 38217 "modules/tclsci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/tclsci/Makefile" ;;
38749 "modules/windows_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/windows_tools/Makefile" ;; 38218 "modules/windows_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/windows_tools/Makefile" ;;
@@ -40652,9 +40121,6 @@ echo " GNU gcc (--with-gcc) ............. = $with_gcc"
40652echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran" 40121echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran"
40653echo "" 40122echo ""
40654echo "Options:" 40123echo "Options:"
40655echo " Use PVM (--without-pvm) .......................... = $with_pvm"
40656echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE"
40657echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR"
40658echo " Do not use TCL/TK (--without-tk) ................. = $with_tk" 40124echo " Do not use TCL/TK (--without-tk) ................. = $with_tk"
40659echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH" 40125echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH"
40660echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH" 40126echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH"
@@ -40708,16 +40174,6 @@ else
40708fi 40174fi
40709 40175
40710echo "" 40176echo ""
40711if test $PVM_ENABLE = yes; then
40712 echo "PVM Configuration:"
40713 echo " PVM Architecture ... = $PVM_ARCH"
40714 echo " PVM INCLUDE ........ = $PVM_INCLUDE"
40715 echo " PVM LIBS ........... = $PVM_LIB"
40716else
40717 echo "Not using PVM"
40718fi
40719
40720echo ""
40721if test $FFTW_ENABLE = yes; then 40177if test $FFTW_ENABLE = yes; then
40722 echo "FFTW Configuration:" 40178 echo "FFTW Configuration:"
40723 echo " FFTW LIBS .......... = $FFTW3_LIB" 40179 echo " FFTW LIBS .......... = $FFTW3_LIB"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 0bf373e..3fadb4d 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1326,22 +1326,6 @@ AM_CONDITIONAL(FFTW, test "$with_fftw" != no)
1326#AM_CONDITIONAL(MPI, test "$with_mpi" = yes) 1326#AM_CONDITIONAL(MPI, test "$with_mpi" = yes)
1327 1327
1328################# 1328#################
1329## PVM
1330#################
1331
1332AC_ARG_WITH(pvm,
1333 AC_HELP_STRING([--without-pvm],[Disable the interface to the PVM library]))
1334
1335PVM_ENABLE=no
1336if test "$with_pvm" != no; then
1337 AC_PVM()
1338 PVM_ENABLE=yes
1339fi
1340AC_SUBST(PVM_ENABLE)
1341
1342AM_CONDITIONAL(PVM, test "$with_pvm" != no)
1343
1344#################
1345## OpenMP 1329## OpenMP
1346################# 1330#################
1347 1331
@@ -1767,7 +1751,6 @@ modules/graphic_export/Makefile
1767modules/renderer/Makefile 1751modules/renderer/Makefile
1768modules/action_binding/Makefile 1752modules/action_binding/Makefile
1769modules/gui/Makefile 1753modules/gui/Makefile
1770modules/pvm/Makefile
1771modules/randlib/Makefile 1754modules/randlib/Makefile
1772modules/tclsci/Makefile 1755modules/tclsci/Makefile
1773modules/windows_tools/Makefile 1756modules/windows_tools/Makefile
@@ -1908,9 +1891,6 @@ echo " GNU gcc (--with-gcc) ............. = $with_gcc"
1908echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran" 1891echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran"
1909echo "" 1892echo ""
1910echo "Options:" 1893echo "Options:"
1911echo " Use PVM (--without-pvm) .......................... = $with_pvm"
1912echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE"
1913echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR"
1914echo " Do not use TCL/TK (--without-tk) ................. = $with_tk" 1894echo " Do not use TCL/TK (--without-tk) ................. = $with_tk"
1915echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH" 1895echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH"
1916echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH" 1896echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH"
@@ -1964,16 +1944,6 @@ else
1964fi 1944fi
1965 1945
1966echo "" 1946echo ""
1967if test $PVM_ENABLE = yes; then
1968 echo "PVM Configuration:"
1969 echo " PVM Architecture ... = $PVM_ARCH"
1970 echo " PVM INCLUDE ........ = $PVM_INCLUDE"
1971 echo " PVM LIBS ........... = $PVM_LIB"
1972else
1973 echo "Not using PVM"
1974fi
1975
1976echo ""
1977if test $FFTW_ENABLE = yes; then 1947if test $FFTW_ENABLE = yes; then
1978 echo "FFTW Configuration:" 1948 echo "FFTW Configuration:"
1979 echo " FFTW LIBS .......... = $FFTW3_LIB" 1949 echo " FFTW LIBS .......... = $FFTW3_LIB"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index a5dce0b..ed5ff7c 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -54,10 +54,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
54 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 54 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
55 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 55 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
56 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 56 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
57 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 57 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
58 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 58 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
59 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 59 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
60 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 60 $(top_srcdir)/configure.ac
61am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 61am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
62 $(ACLOCAL_M4) 62 $(ACLOCAL_M4)
63mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 63mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -215,11 +215,6 @@ PCRE_VERSION = @PCRE_VERSION@
215PKG_CONFIG = @PKG_CONFIG@ 215PKG_CONFIG = @PKG_CONFIG@
216POSUB = @POSUB@ 216POSUB = @POSUB@
217POW_LIB = @POW_LIB@ 217POW_LIB = @POW_LIB@
218PVMGETARCH = @PVMGETARCH@
219PVM_ARCH = @PVM_ARCH@
220PVM_ENABLE = @PVM_ENABLE@
221PVM_INCLUDE = @PVM_INCLUDE@
222PVM_LIB = @PVM_LIB@
223PYTHON = @PYTHON@ 218PYTHON = @PYTHON@
224QDOX = @QDOX@ 219QDOX = @QDOX@
225RANLIB = @RANLIB@ 220RANLIB = @RANLIB@
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index c8bdf59..9dc4173 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -67,7 +67,6 @@
67<module name="scicos" activate="@XCOS_ENABLE@"/> 67<module name="scicos" activate="@XCOS_ENABLE@"/>
68<module name="scicos_blocks" activate="@XCOS_ENABLE@"/> 68<module name="scicos_blocks" activate="@XCOS_ENABLE@"/>
69<!-- comments --> 69<!-- comments -->
70<module name="pvm" activate="@PVM_ENABLE@"/>
71<module name="fftw" activate="@FFTW_ENABLE@"/> 70<module name="fftw" activate="@FFTW_ENABLE@"/>
72<module name="umfpack" activate="@UMFPACK_ENABLE@"/> 71<module name="umfpack" activate="@UMFPACK_ENABLE@"/>
73<module name="module_skeleton" activate="no"/> 72<module name="module_skeleton" activate="no"/>
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index ac354b4..19ca049 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -69,7 +69,6 @@
69<module name="scicos" activate="yes"/> 69<module name="scicos" activate="yes"/>
70<module name="scicos_blocks" activate="yes"/> 70<module name="scicos_blocks" activate="yes"/>
71<!-- comments --> 71<!-- comments -->
72<module name="pvm" activate="yes"/>
73<module name="fftw" activate="yes"/> 72<module name="fftw" activate="yes"/>
74<module name="umfpack" activate="yes"/> 73<module name="umfpack" activate="yes"/>
75<module name="module_skeleton" activate="no"/> 74<module name="module_skeleton" activate="no"/>
diff --git a/scilab/etc/scilab.start b/scilab/etc/scilab.start
index f93dad7..3cb5977 100644
--- a/scilab/etc/scilab.start
+++ b/scilab/etc/scilab.start
@@ -51,7 +51,6 @@ ieee(0);
51// boolean variables 51// boolean variables
52%T = %t; 52%T = %t;
53%F = %f; 53%F = %f;
54%pvm = with_module("pvm");
55%tk = (with_module("tclsci") & getscilabmode() <> "NWNI"); 54%tk = (with_module("tclsci") & getscilabmode() <> "NWNI");
56 55
57// Default Obsolete Warning policy =================================== 56// Default Obsolete Warning policy ===================================
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 85a5c1c..1ab8d6d 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -281,11 +281,6 @@ PCRE_VERSION = @PCRE_VERSION@
281PKG_CONFIG = @PKG_CONFIG@ 281PKG_CONFIG = @PKG_CONFIG@
282POSUB = @POSUB@ 282POSUB = @POSUB@
283POW_LIB = @POW_LIB@ 283POW_LIB = @POW_LIB@
284PVMGETARCH = @PVMGETARCH@
285PVM_ARCH = @PVM_ARCH@
286PVM_ENABLE = @PVM_ENABLE@
287PVM_INCLUDE = @PVM_INCLUDE@
288PVM_LIB = @PVM_LIB@
289PYTHON = @PYTHON@ 284PYTHON = @PYTHON@
290QDOX = @QDOX@ 285QDOX = @QDOX@
291RANLIB = @RANLIB@ 286RANLIB = @RANLIB@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index a5c2a0f..ee859d9 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -52,10 +52,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
52 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 52 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
53 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 53 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
54 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 54 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
55 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 55 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
56 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 56 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
57 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 57 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
58 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 58 $(top_srcdir)/configure.ac
59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 59am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
60 $(ACLOCAL_M4) 60 $(ACLOCAL_M4)
61mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 61mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -253,11 +253,6 @@ PCRE_VERSION = @PCRE_VERSION@
253PKG_CONFIG = @PKG_CONFIG@ 253PKG_CONFIG = @PKG_CONFIG@
254POSUB = @POSUB@ 254POSUB = @POSUB@
255POW_LIB = @POW_LIB@ 255POW_LIB = @POW_LIB@
256PVMGETARCH = @PVMGETARCH@
257PVM_ARCH = @PVM_ARCH@
258PVM_ENABLE = @PVM_ENABLE@
259PVM_INCLUDE = @PVM_INCLUDE@
260PVM_LIB = @PVM_LIB@
261PYTHON = @PYTHON@ 256PYTHON = @PYTHON@
262QDOX = @QDOX@ 257QDOX = @QDOX@
263RANLIB = @RANLIB@ 258RANLIB = @RANLIB@
diff --git a/scilab/libs/blas/Makefile.in b/scilab/libs/blas/Makefile.in
index 5e6fd3e..f8936d5 100644
--- a/scilab/libs/blas/Makefile.in
+++ b/scilab/libs/blas/Makefile.in
@@ -245,11 +245,6 @@ PCRE_VERSION = @PCRE_VERSION@
245PKG_CONFIG = @PKG_CONFIG@ 245PKG_CONFIG = @PKG_CONFIG@
246POSUB = @POSUB@ 246POSUB = @POSUB@
247POW_LIB = @POW_LIB@ 247POW_LIB = @POW_LIB@
248PVMGETARCH = @PVMGETARCH@
249PVM_ARCH = @PVM_ARCH@
250PVM_ENABLE = @PVM_ENABLE@
251PVM_INCLUDE = @PVM_INCLUDE@
252PVM_LIB = @PVM_LIB@
253PYTHON = @PYTHON@ 248PYTHON = @PYTHON@
254RANLIB = @RANLIB@ 249RANLIB = @RANLIB@
255RELOCATABLE = @RELOCATABLE@ 250RELOCATABLE = @RELOCATABLE@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index fd45290..1404f79 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -73,10 +73,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
77 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 77 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
78 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 78 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
79 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 79 $(top_srcdir)/configure.ac
80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
81 $(ACLOCAL_M4) 81 $(ACLOCAL_M4)
82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -283,11 +283,6 @@ PCRE_VERSION = @PCRE_VERSION@
283PKG_CONFIG = @PKG_CONFIG@ 283PKG_CONFIG = @PKG_CONFIG@
284POSUB = @POSUB@ 284POSUB = @POSUB@
285POW_LIB = @POW_LIB@ 285POW_LIB = @POW_LIB@
286PVMGETARCH = @PVMGETARCH@
287PVM_ARCH = @PVM_ARCH@
288PVM_ENABLE = @PVM_ENABLE@
289PVM_INCLUDE = @PVM_INCLUDE@
290PVM_LIB = @PVM_LIB@
291PYTHON = @PYTHON@ 286PYTHON = @PYTHON@
292QDOX = @QDOX@ 287QDOX = @QDOX@
293RANLIB = @RANLIB@ 288RANLIB = @RANLIB@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index bf29fd1..bdde6f7 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -73,10 +73,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
77 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 77 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
78 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 78 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
79 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 79 $(top_srcdir)/configure.ac
80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
81 $(ACLOCAL_M4) 81 $(ACLOCAL_M4)
82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -283,11 +283,6 @@ PCRE_VERSION = @PCRE_VERSION@
283PKG_CONFIG = @PKG_CONFIG@ 283PKG_CONFIG = @PKG_CONFIG@
284POSUB = @POSUB@ 284POSUB = @POSUB@
285POW_LIB = @POW_LIB@ 285POW_LIB = @POW_LIB@
286PVMGETARCH = @PVMGETARCH@
287PVM_ARCH = @PVM_ARCH@
288PVM_ENABLE = @PVM_ENABLE@
289PVM_INCLUDE = @PVM_INCLUDE@
290PVM_LIB = @PVM_LIB@
291PYTHON = @PYTHON@ 286PYTHON = @PYTHON@
292QDOX = @QDOX@ 287QDOX = @QDOX@
293RANLIB = @RANLIB@ 288RANLIB = @RANLIB@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index fbd576d..2228cb3 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -73,10 +73,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 73 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 74 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 75 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 76 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
77 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 77 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
78 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 78 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
79 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 79 $(top_srcdir)/configure.ac
80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 80am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
81 $(ACLOCAL_M4) 81 $(ACLOCAL_M4)
82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 82mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -281,11 +281,6 @@ PCRE_VERSION = @PCRE_VERSION@
281PKG_CONFIG = @PKG_CONFIG@ 281PKG_CONFIG = @PKG_CONFIG@
282POSUB = @POSUB@ 282POSUB = @POSUB@
283POW_LIB = @POW_LIB@ 283POW_LIB = @POW_LIB@
284PVMGETARCH = @PVMGETARCH@
285PVM_ARCH = @PVM_ARCH@
286PVM_ENABLE = @PVM_ENABLE@
287PVM_INCLUDE = @PVM_INCLUDE@
288PVM_LIB = @PVM_LIB@
289PYTHON = @PYTHON@ 284PYTHON = @PYTHON@
290QDOX = @QDOX@ 285QDOX = @QDOX@
291RANLIB = @RANLIB@ 286RANLIB = @RANLIB@
diff --git a/scilab/libs/lapack/Makefile.in b/scilab/libs/lapack/Makefile.in
index 59a17fa..d726915 100644
--- a/scilab/libs/lapack/Makefile.in
+++ b/scilab/libs/lapack/Makefile.in
@@ -293,11 +293,6 @@ PCRE_VERSION = @PCRE_VERSION@
293PKG_CONFIG = @PKG_CONFIG@ 293PKG_CONFIG = @PKG_CONFIG@
294POSUB = @POSUB@ 294POSUB = @POSUB@
295POW_LIB = @POW_LIB@ 295POW_LIB = @POW_LIB@
296PVMGETARCH = @PVMGETARCH@
297PVM_ARCH = @PVM_ARCH@
298PVM_ENABLE = @PVM_ENABLE@
299PVM_INCLUDE = @PVM_INCLUDE@
300PVM_LIB = @PVM_LIB@
301PYTHON = @PYTHON@ 296PYTHON = @PYTHON@
302RANLIB = @RANLIB@ 297RANLIB = @RANLIB@
303RELOCATABLE = @RELOCATABLE@ 298RELOCATABLE = @RELOCATABLE@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index dfdba51..b245f3d 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -71,10 +71,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
75 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 75 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
76 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 76 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 77 $(top_srcdir)/configure.ac
78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
79 $(ACLOCAL_M4) 79 $(ACLOCAL_M4)
80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -277,11 +277,6 @@ PCRE_VERSION = @PCRE_VERSION@
277PKG_CONFIG = @PKG_CONFIG@ 277PKG_CONFIG = @PKG_CONFIG@
278POSUB = @POSUB@ 278POSUB = @POSUB@
279POW_LIB = @POW_LIB@ 279POW_LIB = @POW_LIB@
280PVMGETARCH = @PVMGETARCH@
281PVM_ARCH = @PVM_ARCH@
282PVM_ENABLE = @PVM_ENABLE@
283PVM_INCLUDE = @PVM_INCLUDE@
284PVM_LIB = @PVM_LIB@
285PYTHON = @PYTHON@ 280PYTHON = @PYTHON@
286QDOX = @QDOX@ 281QDOX = @QDOX@
287RANLIB = @RANLIB@ 282RANLIB = @RANLIB@
diff --git a/scilab/m4/pvm.m4 b/scilab/m4/pvm.m4
deleted file mode 100644
index 6ffde58..0000000
--- a/scilab/m4/pvm.m4
+++ /dev/null
@@ -1,362 +0,0 @@
1dnl AC_PVM
2dnl ------------------------------------------------------
3dnl Check if PVM is usable
4dnl INPUTS :
5dnl Nothing
6dnl
7dnl OUTPUTS
8dnl PVM_OK : 1 if it is possible to use it
9dnl
10dnl
11dnl --------------------------------------------------------
12dnl
13dnl General comments about PVM detection
14dnl
15dnl A typical installation has a hierarchy under PVM_ROOT that includes
16dnl PVM_ROOT/include/pvm3.h
17dnl PVM_ROOT/lib/pvmgetarch
18dnl PVM_ROOT/lib/<pvmarch>/libfpvm3.{a,so}
19dnl PVM_ROOT/lib/<pvmarch>/libgpvm3.{a,so}
20dnl PVM_ROOT/lib/<pvmarch>/libpvm3.{a,so}
21dnl
22dnl The setting for <pvmarch> is given by the output of the
23dnl PVM_ROOT/lib/pvmgetarch program.
24dnl
25dnl This typical installation has been seen on several different
26dnl operating systems and several different packaging systems. It can
27dnl be considered the "normal" case. In addition, the documentation
28dnl that comes with pvm3 says that the variable
29dnl PVM_ROOT should be set in the users environment when using
30dnl pvm3 or compiling programs that use pvm3.
31dnl
32dnl --------------------------------------------------------
33dnl Variations that have been encountered "in the field" are:
34dnl
35dnl --------------------------------------------------------
36dnl header installed to /usr/include/pvm3.h but the rest of the install
37dnl to PVM_ROOT (where PVM_ROOT=/usr/share/pvm3 in one particular instance).
38dnl
39dnl This case can be dealt with by using the --with-pvm-includes option
40dnl --------------------------------------------------------
41dnl No shared libraries installed. Only static libs. This may cause
42dnl issues with linking on some systems. This may have to wait for a real
43dnl world trial to see how it pans out.
44dnl --------------------------------------------------------
45dnl
46dnl
47dnl The libraries installed by pvm3 are:
48dnl $PVM_ROOT/lib/$PVM_ARCH/libpvm3.a - C (base) library
49dnl $PVM_ROOT/lib/$PVM_ARCH/libfpvm3.a - Fortran wrapper library
50dnl $PVM_ROOT/lib/$PVM_ARCH/libgpvm3.a - Group function library
51
52AC_DEFUN([AC_PVM], [
53
54 AC_MSG_CHECKING([if PVM_ROOT has been set])
55 if test "x$PVM_ROOT" = "x"; then
56 AC_MSG_RESULT([no. I will try to guess a value for it])
57 _pvm_path="${PATH}"
58 # this variable will be used later to see if the user specified
59 # PVM_ROOT or if we guessed at it based on the location of the
60 # header
61 _pvm_root_specified=no
62 else
63 AC_MSG_RESULT([yes ($PVM_ROOT)])
64
65 _pvm_root_specified=yes
66 # PVM_ROOT is set, make sure the directory exists
67 AC_MSG_CHECKING([if the specified PVM_ROOT directory exists])
68 if test -d "$PVM_ROOT" ; then
69 AC_MSG_RESULT([yes])
70 else
71 AC_MSG_RESULT([no])
72 AC_MSG_ERROR([The directory specified by PVM_ROOT does not exist.
73The value of PVM_ROOT must either be left unspecified (empty or not defined)
74or set to a valid directory that is the root of a pvm3 installation.
75])
76 fi
77
78 # PVM_ROOT is set and the directory exists. Now make sure it looks
79 # like a pvm installation!
80 AC_MSG_CHECKING([if the specified PVM_ROOT contains a pvm installation])
81 if test -r "${PVM_ROOT}/include/pvm3.h" ; then
82 AC_MSG_RESULT([yes])
83 else
84 AC_MSG_RESULT([no])
85 AC_MSG_ERROR([The directory specified by PVM_ROOT does not appear
86to be a valid pvm installation directory. This is based on PVM_ROOT/include/pvm3.h
87not existing. The value of PVM_ROOT must either be left unspecified (empty or
88not defined) or set to a valid directory that is the root of a pvm3 installation.])
89 fi
90
91 # If we made it this far then it means PVM_ROOT is set and appears to
92 # be valid.
93 # we'll use this path for looking for pvmgetarch.
94 _pvm_path="${PVM_ROOT}/lib:${PATH}"
95 fi
96
97 # check for pvmgetarch. If specified then PVM_ROOT/lib is placed at the
98 # beginning of the search path. The user can force this by
99 # simply setting PVMGETARCH on the configure command line like
100 # PVMGETARCH=/path/to/pvmgetarch if they need to force a particular value.
101 AC_PATH_PROG([PVMGETARCH],[pvmgetarch],[no], [$_pvm_path])
102
103 if test "$PVMGETARCH" = "no" ; then
104 AC_MSG_ERROR([Unable to find pvmgetarch in PVM_ROOT/lib or PATH])
105 fi
106
107
108 # FIXME -- if we ever wish to cross compile scilab with pvm support in place
109 # then the user will need o specify PVM_ARCH correctly. See pvm_intro(1PVM) for
110 # more details on the supported environment variables.
111 AC_CACHE_CHECK([for PVM architecture],[PVM_ARCH], [PVM_ARCH=`$PVMGETARCH`])
112 if test "x$PVM_ARCH" = "xUNKNOWN"; then
113 AC_MSG_ERROR([PVM is unable to recognise the architecture. This means that
114pvmgetarch ($PVMGETARCH) is broken on your system.
115])
116 fi
117
118
119 # now we start looking for the pvm3.h header.
120 USER_PVMINCLUDE=""
121 AC_ARG_WITH(pvm-include,
122 AC_HELP_STRING([--with-pvm-include=DIR],[Set the path to the PVM headers]),
123 [ USER_PVMINCLUDE=$withval
124 ])
125
126 AC_PVM_INCLUDE($USER_PVMINCLUDE)
127
128 AC_DEFINE([WITH_PVM],[],[With PVM])
129
130 if test "x$PVM_ROOT" = "x" ; then
131 # PVM_ROOT was not set so try to guess it from the header location.
132 # Since if we made it this far, we must have found the pvm3.h header
133 # somewhere and that somewhere is in $PVM_INCLUDE_DIR.
134 AC_MSG_CHECKING([for a reasonable guess at PVM_ROOT since PVM_ROOT was not set])
135 PVM_ROOT="`dirname $PVM_INCLUDE_DIR`"
136 AC_MSG_RESULT([$PVM_ROOT])
137 fi
138
139 PVMLIBDIR=$PVM_ROOT/lib/$PVM_ARCH
140 USER_PVMLIBDIR=""
141 AC_ARG_WITH(pvm-library,
142 AC_HELP_STRING([--with-pvm-library=DIR],[Set the path to the PVM library directory]),
143 [ USER_PVMLIBDIR=$withval
144 ])
145 AC_PVM_LIBRARY($USER_PVMLIBDIR)
146
147
148 if test ! -z "$PVM_INCLUDE" -a ! -z "$PVM_LIB"; then
149 PVM_OK=1
150 else
151 AC_MSG_ERROR([Cannot find headers (pvm3.h) or PVM library. Please install the dev package for pvm3.])
152 fi
153 AC_SUBST(PVM_ARCH)
154 AC_SUBST(PVM_LIB)
155 AC_SUBST(PVM_INCLUDE)
156])
157
158
159
160# INPUTS :
161# $1 : Path of PVM provided by the user (/usr/include/pvm)
162#
163# OUTPUTS
164# PVM_INCLUDE : Flag to include files
165AC_DEFUN([AC_PVM_INCLUDE], [
166 AC_MSG_CHECKING([PVM header files])
167 USER_PVMINCLUDE="$1"
168
169 _pvm_header=pvm3.h
170 # if the user has given a --with-pvm-include configure option but the specified
171 # directory does not exist, then error out. We don't keep searching in this case
172 # because the user has explicitly told us where to look and that location didn't
173 # exist.
174 if test "x$USER_PVMINCLUDE" != "x" -a ! -d "$USER_PVMINCLUDE" ; then
175 AC_MSG_ERROR([The specified PVM include directory, $USER_PVMINCLUDE, does not exist.])
176 fi
177
178 if test "x$USER_PVMINCLUDE" != "x" ; then
179 # if the user has given a --with-pvm-include configure option but there is no pvm3.h
180 # there then error out. We don't keep searching in this case because the user has
181 # explicitly told us where to look but we didn't find what we needed there.
182 if test -f "$USER_PVMINCLUDE/${_pvm_header}" ; then
183 PVM_INCLUDE_DIR="$USER_PVMINCLUDE"
184 else
185 AC_MSG_ERROR([Cannot find PVM header (${_pvm_header}) in the specified directory ($USER_PVMINCLUDE).])
186 fi
187 else
188 # we have not been given a --with-pvm-include option, so we have to go looking
189 # for the pvm header
190 incpath=""
191
192 # if PVM_ROOT is set, then look there first
193 if test "x$PVM_ROOT" != "x" ; then
194 incpath="$PVM_ROOT/include $incpath"
195 else
196 # PVM_ROOT is not set so lets take a guess at what it may be.
197 # pvmgetarch is supposed to be installed as PVM_ROOT/lib/pvmgetarch
198 # so dirname $PVMGETARCH should give PVM_ROOT/lib
199 # and dirname again should give a guess at PVM_ROOT
200 tmp=`dirname $PVMGETARCH`
201 tmp=`dirname $tmp`
202 incpath="${tmp}/include $incpath"
203 fi
204
205 # add a bunch of other paths
206 incpath="$incpath /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src"
207 PVM_INCLUDE=""
208 for INC_PATH in $incpath; do
209 F="$INC_PATH/${_pvm_header}"
210 if test -f "$F"; then
211 PVM_INCLUDE_DIR="${INC_PATH}"
212 break 1;
213 fi
214 done
215 if test -z "$PVM_INCLUDE_DIR"; then
216 AC_MSG_ERROR([Could not locate PVM include file (${_pvm_header})])
217 fi
218 fi
219 AC_MSG_RESULT([PVM header found in $PVM_INCLUDE_DIR])
220
221 ac_save_CPPFLAGS="$CPPFLAGS"
222 ac_save_CFLAGS="$CFLAGS"
223
224 CPPFLAGS="-I$PVM_INCLUDE_DIR $CPPFLAGS"
225 CFLAGS="-I$PVM_INCLUDE_DIR $CFLAGS"
226
227 AC_CHECK_HEADER([pvm3.h],,[AC_MSG_ERROR([check for PVM headers failed])])
228
229 CPPFLAGS=$ac_save_CPPFLAGS
230 CFLAGS=$ac_save_CFLAGS
231 PVM_INCLUDE="-I${PVM_INCLUDE_DIR}"
232])
233
234
235# INPUTS :
236# $1 : Path of PVM lib provided by the user (/usr/lib/pvm)
237# OUPUTS :
238# PVM_LIB_OK : 1 if link is OK; 0 otherwise
239# PVM_LIB : flag to link against pvm lib
240
241AC_DEFUN([AC_PVM_LIBRARY], [
242 USER_PVMLIBDIR="$1"
243
244 # if the user has given a --with-pvm-library configure option but the specified
245 # directory does not exist, then error out. We don't keep searching in this case
246 # because the user has explicitly told us where to look and that location did not
247 # exist.
248 if test "x$USER_PVMLIBDIR" != "x" ; then
249 AC_MSG_CHECKING([if the specified PVM library directory ($USER_PVMLIBDIR) exists])
250 if test -d "$USER_PVMLIBDIR" ; then
251 AC_MSG_RESULT([yes])
252 else
253 AC_MSG_ERROR([The specified PVM library directory ($USER_PVMLIBDIR) does not exist.
254When specifying a PVM library directory with --with-pvm-libraries, the directory must
255exist and contain PVM libraries])
256 fi
257 fi
258
259
260 dirs="$USER_PVMLIBDIR $PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 ."
261 libnames="pvm3 pvm"
262
263
264 # if the user has given a --with-pvm-library configure option, only look there.
265 if test "x$USER_PVMLIBDIR" != "x" ; then
266 dirs="$USER_PVMLIBDIR"
267 AC_MSG_CHECKING([for PVM libraries in $USER_PVMLIBDIR])
268 elif test "$_pvm_root_specified" = "yes" ; then
269 # otherwise, if the user has specified PVM_ROOT (as opposed to configure
270 # having guessed it), then only look in PVMLIBDIR (derived from PVM_ROOT
271 # and PVMGETARCH output
272 AC_MSG_CHECKING([for PVM libraries in $PVMLIBDIR])
273 dirs="$PVMLIBDIR"
274 else
275 AC_MSG_CHECKING([for PVM libraries])
276 fi
277
278 # put the path loop on the outside because we always want to look in
279 # the user specified directory and the PVM_ROOT directory first for all possible
280 # names instead of accidentally picking up something from a different directory
281 for PATH_LIB_PVM in $dirs; do
282 for NAME_LIB_PVM in $libnames; do
283 m=lib${NAME_LIB_PVM}
284 # note that the * is outside the quotes to allow the shell to expand it.
285 # The rest is quoted in case we have spaces or anything weird in the path.
286 ls "${PATH_LIB_PVM}/${m}."* >/dev/null 2>/dev/null
287 rc=$?
288 if test $rc -eq 0 ; then
289 # we found a candidate directory
290 # so check it out and see if it works
291 AC_MSG_RESULT([found $m in $PATH_LIB_PVM])
292 saved_cflags="$CFLAGS"
293 saved_ldflags="$LDFLAGS"
294 saved_cppflags="$CPPFLAGS"
295 saved_libs="$LIBS"
296 CFLAGS="$PVM_INCLUDE $CFLAGS"
297 CPPFLAGS="$PVM_INCLUDE $CPPFLAGS"
298 LDFLAGS="$LDFLAGS -L$PATH_LIB_PVM"
299
300 # pvm_spawn() is a basic pvm3 function and should be in libpvm3
301 AC_SEARCH_LIBS([pvm_spawn],[pvm3 pvm],[PVM_SPAWN=$ac_res],
302 [AC_MSG_ERROR([Could not find the library with pvm_spawn(). Check that your PVM installation is not broken])]
303 )
304
305 if test "$PVM_SPAWN" = "none required" ; then
306 PVM_SPAWN=""
307 fi
308
309 # pvm_barrier() is one of the group functions and should be in libgpvm3
310 AC_SEARCH_LIBS([pvm_barrier],[pvm3 gpvm3],[PVM_BARRIER=$ac_res],
311 [AC_MSG_ERROR([Could not find the library with pvm_barrier(). Check that your PVM installation is not broken])]
312 )
313
314 if test "$PVM_BARRIER" = "none required" ; then
315 PVM_BARRIER=""
316 fi
317
318 PVMLIBS="$PVM_SPAWN $PVM_BARRIER"
319 PVM_LIB_OK=1
320
321 CFLAGS="$saved_cflags"
322 CPPFLAGS="$saved_cppflags"
323 LDFLAGS="$saved_ldflags"
324 LIBS="$saved_libs"
325
326 if test $PVM_LIB_OK = 1; then
327 PVM_LIB="-L$PATH_LIB_PVM $PVMLIBS"
328 break 2;
329 fi
330 fi
331 done # end of libname loop
332 done # end of directory loop
333
334
335# if we didn't find the PVM library, then spit out an error message
336# about it. The error message is customized based on if the user
337# has specified PVM_ROOT or --with-pvm-libraries
338if test -z "$PVM_LIB"; then
339
340 if test "x$USER_PVMLIBDIR" != "x" ; then
341
342 AC_MSG_ERROR([could not locate PVM libraries in the directory
343specified by --with-pvm-libraries ($USER_PVMLIBDIR)])
344
345 elif test "$_pvm_root_specified" = "yes" ; then
346
347 AC_MSG_ERROR([could not locate PVM libraries by way of
348PVM_ROOT/lib/<PVM_ARCH> ($PVMLIBDIR). Either correct your PVM
349installation, PVM_ROOT, or use the --with-pvm-libraries configure
350option if your pvm libraries are installed in a non-standard
351location.])
352
353 else
354
355 AC_MSG_ERROR([check for PVM library failed. You may wish
356to try setting PVM_ROOT to the root of your PVM installation or use
357the --with-pvm-libraries option to specify the directory containing
358the PVM library.])
359 fi
360fi
361
362])
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 4cc1dab..1424cf5 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -51,7 +51,6 @@ cacsd \
51polynomials \ 51polynomials \
52boolean \ 52boolean \
53double \ 53double \
54pvm \
55io \ 54io \
56intersci \ 55intersci \
57signal_processing \ 56signal_processing \
@@ -190,7 +189,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
190 $(top_builddir)/modules/string/libscistring.la \ 189 $(top_builddir)/modules/string/libscistring.la \
191 $(top_builddir)/modules/functions/libscifunctions.la \ 190 $(top_builddir)/modules/functions/libscifunctions.la \
192 $(top_builddir)/modules/hdf5/libscihdf5.la \ 191 $(top_builddir)/modules/hdf5/libscihdf5.la \
193 $(top_builddir)/modules/pvm/libscipvm.la \
194 $(top_builddir)/modules/fftw/libscifftw.la 192 $(top_builddir)/modules/fftw/libscifftw.la
195 193
196 194
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 6b11210..021b9cc 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -81,10 +81,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
81 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 81 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
82 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 82 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
83 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 83 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
84 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 84 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
85 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 85 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
86 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 86 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
87 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 87 $(top_srcdir)/configure.ac
88am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 88am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 $(ACLOCAL_M4) 89 $(ACLOCAL_M4)
90mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 90mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -161,7 +161,7 @@ DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
161 completion console graphic_export gui graphics optimization \ 161 completion console graphic_export gui graphics optimization \
162 symbolic randlib statistics special_functions interpolation \ 162 symbolic randlib statistics special_functions interpolation \
163 linear_algebra integer data_structures mexlib \ 163 linear_algebra integer data_structures mexlib \
164 differential_equations cacsd polynomials boolean double pvm io \ 164 differential_equations cacsd polynomials boolean double io \
165 intersci signal_processing core call_scilab sound time sparse \ 165 intersci signal_processing core call_scilab sound time sparse \
166 windows_tools functions overloading maple2scilab m2sci texmacs \ 166 windows_tools functions overloading maple2scilab m2sci texmacs \
167 development_tools compatibility_functions helptools fftw \ 167 development_tools compatibility_functions helptools fftw \
@@ -343,11 +343,6 @@ PCRE_VERSION = @PCRE_VERSION@
343PKG_CONFIG = @PKG_CONFIG@ 343PKG_CONFIG = @PKG_CONFIG@
344POSUB = @POSUB@ 344POSUB = @POSUB@
345POW_LIB = @POW_LIB@ 345POW_LIB = @POW_LIB@
346PVMGETARCH = @PVMGETARCH@
347PVM_ARCH = @PVM_ARCH@
348PVM_ENABLE = @PVM_ENABLE@
349PVM_INCLUDE = @PVM_INCLUDE@
350PVM_LIB = @PVM_LIB@
351PYTHON = @PYTHON@ 346PYTHON = @PYTHON@
352QDOX = @QDOX@ 347QDOX = @QDOX@
353RANLIB = @RANLIB@ 348RANLIB = @RANLIB@
@@ -454,7 +449,7 @@ SUBDIRS = output_stream arnoldi elementary_functions string api_scilab \
454 console graphic_export gui graphics optimization symbolic \ 449 console graphic_export gui graphics optimization symbolic \
455 randlib statistics special_functions interpolation \ 450 randlib statistics special_functions interpolation \
456 linear_algebra integer data_structures mexlib \ 451 linear_algebra integer data_structures mexlib \
457 differential_equations cacsd polynomials boolean double pvm io \ 452 differential_equations cacsd polynomials boolean double io \
458 intersci signal_processing core call_scilab interpolation \ 453 intersci signal_processing core call_scilab interpolation \
459 sound time randlib sparse windows_tools functions overloading \ 454 sound time randlib sparse windows_tools functions overloading \
460 maple2scilab m2sci texmacs development_tools \ 455 maple2scilab m2sci texmacs development_tools \
@@ -534,7 +529,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
534 $(top_builddir)/modules/string/libscistring.la \ 529 $(top_builddir)/modules/string/libscistring.la \
535 $(top_builddir)/modules/functions/libscifunctions.la \ 530 $(top_builddir)/modules/functions/libscifunctions.la \
536 $(top_builddir)/modules/hdf5/libscihdf5.la \ 531 $(top_builddir)/modules/hdf5/libscihdf5.la \
537 $(top_builddir)/modules/pvm/libscipvm.la \
538 $(top_builddir)/modules/fftw/libscifftw.la 532 $(top_builddir)/modules/fftw/libscifftw.la
539 533
540 534
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index a599cab..1c178b0 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -78,10 +78,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
78 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 78 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
79 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 79 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
80 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 80 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
81 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 81 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
82 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 82 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
83 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 83 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
84 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 84 $(top_srcdir)/configure.ac
85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
86 $(ACLOCAL_M4) 86 $(ACLOCAL_M4)
87mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 87mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -336,11 +336,6 @@ PCRE_VERSION = @PCRE_VERSION@
336PKG_CONFIG = @PKG_CONFIG@ 336PKG_CONFIG = @PKG_CONFIG@
337POSUB = @POSUB@ 337POSUB = @POSUB@
338POW_LIB = @POW_LIB@ 338POW_LIB = @POW_LIB@
339PVMGETARCH = @PVMGETARCH@
340PVM_ARCH = @PVM_ARCH@
341PVM_ENABLE = @PVM_ENABLE@
342PVM_INCLUDE = @PVM_INCLUDE@
343PVM_LIB = @PVM_LIB@
344PYTHON = @PYTHON@ 339PYTHON = @PYTHON@
345QDOX = @QDOX@ 340QDOX = @QDOX@
346RANLIB = @RANLIB@ 341RANLIB = @RANLIB@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 3881515..5719be3 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -76,10 +76,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
76 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 76 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
77 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 77 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
78 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 78 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
79 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 79 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
80 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 80 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
81 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 81 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
82 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 82 $(top_srcdir)/configure.ac
83am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 83am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
84 $(ACLOCAL_M4) 84 $(ACLOCAL_M4)
85mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 85mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -297,11 +297,6 @@ PCRE_VERSION = @PCRE_VERSION@
297PKG_CONFIG = @PKG_CONFIG@ 297PKG_CONFIG = @PKG_CONFIG@
298POSUB = @POSUB@ 298POSUB = @POSUB@
299POW_LIB = @POW_LIB@ 299POW_LIB = @POW_LIB@
300PVMGETARCH = @PVMGETARCH@
301PVM_ARCH = @PVM_ARCH@
302PVM_ENABLE = @PVM_ENABLE@
303PVM_INCLUDE = @PVM_INCLUDE@
304PVM_LIB = @PVM_LIB@
305PYTHON = @PYTHON@ 300PYTHON = @PYTHON@
306QDOX = @QDOX@ 301QDOX = @QDOX@
307RANLIB = @RANLIB@ 302RANLIB = @RANLIB@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index ea00f5e..3e80a27 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -306,11 +306,6 @@ PCRE_VERSION = @PCRE_VERSION@
306PKG_CONFIG = @PKG_CONFIG@ 306PKG_CONFIG = @PKG_CONFIG@
307POSUB = @POSUB@ 307POSUB = @POSUB@
308POW_LIB = @POW_LIB@ 308POW_LIB = @POW_LIB@
309PVMGETARCH = @PVMGETARCH@
310PVM_ARCH = @PVM_ARCH@
311PVM_ENABLE = @PVM_ENABLE@
312PVM_INCLUDE = @PVM_INCLUDE@
313PVM_LIB = @PVM_LIB@
314PYTHON = @PYTHON@ 309PYTHON = @PYTHON@
315QDOX = @QDOX@ 310QDOX = @QDOX@
316RANLIB = @RANLIB@ 311RANLIB = @RANLIB@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 454ab9e..ae02192d 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -75,10 +75,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
75 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 75 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
76 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 76 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
77 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 77 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
78 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 78 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
79 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 79 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
80 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 80 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
81 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 81 $(top_srcdir)/configure.ac
82am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 82am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
83 $(ACLOCAL_M4) 83 $(ACLOCAL_M4)
84mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 84mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -262,11 +262,6 @@ PCRE_VERSION = @PCRE_VERSION@
262PKG_CONFIG = @PKG_CONFIG@ 262PKG_CONFIG = @PKG_CONFIG@
263POSUB = @POSUB@ 263POSUB = @POSUB@
264POW_LIB = @POW_LIB@ 264POW_LIB = @POW_LIB@
265PVMGETARCH = @PVMGETARCH@
266PVM_ARCH = @PVM_ARCH@
267PVM_ENABLE = @PVM_ENABLE@
268PVM_INCLUDE = @PVM_INCLUDE@
269PVM_LIB = @PVM_LIB@
270PYTHON = @PYTHON@ 265PYTHON = @PYTHON@
271QDOX = @QDOX@ 266QDOX = @QDOX@
272RANLIB = @RANLIB@ 267RANLIB = @RANLIB@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 18c02d2..869dd3f 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -303,11 +303,6 @@ PCRE_VERSION = @PCRE_VERSION@
303PKG_CONFIG = @PKG_CONFIG@ 303PKG_CONFIG = @PKG_CONFIG@
304POSUB = @POSUB@ 304POSUB = @POSUB@
305POW_LIB = @POW_LIB@ 305POW_LIB = @POW_LIB@
306PVMGETARCH = @PVMGETARCH@
307PVM_ARCH = @PVM_ARCH@
308PVM_ENABLE = @PVM_ENABLE@
309PVM_INCLUDE = @PVM_INCLUDE@
310PVM_LIB = @PVM_LIB@
311PYTHON = @PYTHON@ 306PYTHON = @PYTHON@
312QDOX = @QDOX@ 307QDOX = @QDOX@
313RANLIB = @RANLIB@ 308RANLIB = @RANLIB@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 8577a7d..bbdaedb 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -348,11 +348,6 @@ PCRE_VERSION = @PCRE_VERSION@
348PKG_CONFIG = @PKG_CONFIG@ 348PKG_CONFIG = @PKG_CONFIG@
349POSUB = @POSUB@ 349POSUB = @POSUB@
350POW_LIB = @POW_LIB@ 350POW_LIB = @POW_LIB@
351PVMGETARCH = @PVMGETARCH@
352PVM_ARCH = @PVM_ARCH@
353PVM_ENABLE = @PVM_ENABLE@
354PVM_INCLUDE = @PVM_INCLUDE@
355PVM_LIB = @PVM_LIB@
356PYTHON = @PYTHON@ 351PYTHON = @PYTHON@
357QDOX = @QDOX@ 352QDOX = @QDOX@
358RANLIB = @RANLIB@ 353RANLIB = @RANLIB@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 3f206b8..0db6b67 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -74,10 +74,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
74 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 74 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
75 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 75 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
76 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 76 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
77 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 77 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
78 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 78 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
79 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 79 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
80 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 80 $(top_srcdir)/configure.ac
81am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 81am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
82 $(ACLOCAL_M4) 82 $(ACLOCAL_M4)
83mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 83mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -305,11 +305,6 @@ PCRE_VERSION = @PCRE_VERSION@
305PKG_CONFIG = @PKG_CONFIG@ 305PKG_CONFIG = @PKG_CONFIG@
306POSUB = @POSUB@ 306POSUB = @POSUB@
307POW_LIB = @POW_LIB@ 307POW_LIB = @POW_LIB@
308PVMGETARCH = @PVMGETARCH@
309PVM_ARCH = @PVM_ARCH@
310PVM_ENABLE = @PVM_ENABLE@
311PVM_INCLUDE = @PVM_INCLUDE@
312PVM_LIB = @PVM_LIB@
313PYTHON = @PYTHON@ 308PYTHON = @PYTHON@
314QDOX = @QDOX@ 309QDOX = @QDOX@
315RANLIB = @RANLIB@ 310RANLIB = @RANLIB@
diff --git a/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak b/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
index 00cd205..23394e2 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
+++ b/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
@@ -35,5 +35,5 @@ distclean:: clean
35$(SCIDIR)/bin/prog.exe : $(OBJSC) 35$(SCIDIR)/bin/prog.exe : $(OBJSC)
36 @echo "Linking" 36 @echo "Linking"
37 $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \ 37 $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \
38 $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(TKLIBS) $(PVMLIB) $(GUI) -NODEFAULTLIB:msvcrt.lib 38 $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(TKLIBS) $(GUI) -NODEFAULTLIB:msvcrt.lib
39 @echo "done " $(SCIDIR)/bin/prog.exe 39 @echo "done " $(SCIDIR)/bin/prog.exe
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index b5997ea..1b75488 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -79,10 +79,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
79 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 79 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
80 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 80 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
81 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 81 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
82 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 82 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
83 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 83 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
84 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 84 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
85 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 85 $(top_srcdir)/configure.ac
86am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 86am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
87 $(ACLOCAL_M4) 87 $(ACLOCAL_M4)
88mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 88mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -310,11 +310,6 @@ PCRE_VERSION = @PCRE_VERSION@
310PKG_CONFIG = @PKG_CONFIG@ 310PKG_CONFIG = @PKG_CONFIG@
311POSUB = @POSUB@ 311POSUB = @POSUB@
312POW_LIB = @POW_LIB@ 312POW_LIB = @POW_LIB@
313PVMGETARCH = @PVMGETARCH@
314PVM_ARCH = @PVM_ARCH@
315PVM_ENABLE = @PVM_ENABLE@
316PVM_INCLUDE = @PVM_INCLUDE@
317PVM_LIB = @PVM_LIB@
318PYTHON = @PYTHON@ 313PYTHON = @PYTHON@
319QDOX = @QDOX@ 314QDOX = @QDOX@
320RANLIB = @RANLIB@ 315RANLIB = @RANLIB@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 2420f77..299a333 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -259,11 +259,6 @@ PCRE_VERSION = @PCRE_VERSION@
259PKG_CONFIG = @PKG_CONFIG@ 259PKG_CONFIG = @PKG_CONFIG@
260POSUB = @POSUB@ 260POSUB = @POSUB@
261POW_LIB = @POW_LIB@ 261POW_LIB = @POW_LIB@
262PVMGETARCH = @PVMGETARCH@
263PVM_ARCH = @PVM_ARCH@
264PVM_ENABLE = @PVM_ENABLE@
265PVM_INCLUDE = @PVM_INCLUDE@
266PVM_LIB = @PVM_LIB@
267PYTHON = @PYTHON@ 262PYTHON = @PYTHON@
268QDOX = @QDOX@ 263QDOX = @QDOX@
269RANLIB = @RANLIB@ 264RANLIB = @RANLIB@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 6b68cd7..5490c89 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -78,10 +78,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
78 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 78 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
79 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 79 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
80 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 80 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
81 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 81 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
82 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 82 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
83 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 83 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
84 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 84 $(top_srcdir)/configure.ac
85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
86 $(ACLOCAL_M4) 86 $(ACLOCAL_M4)
87mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 87mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -329,11 +329,6 @@ PCRE_VERSION = @PCRE_VERSION@
329PKG_CONFIG = @PKG_CONFIG@ 329PKG_CONFIG = @PKG_CONFIG@
330POSUB = @POSUB@ 330POSUB = @POSUB@
331POW_LIB = @POW_LIB@ 331POW_LIB = @POW_LIB@
332PVMGETARCH = @PVMGETARCH@
333PVM_ARCH = @PVM_ARCH@
334PVM_ENABLE = @PVM_ENABLE@
335PVM_INCLUDE = @PVM_INCLUDE@
336PVM_LIB = @PVM_LIB@
337PYTHON = @PYTHON@ 332PYTHON = @PYTHON@
338QDOX = @QDOX@ 333QDOX = @QDOX@
339RANLIB = @RANLIB@ 334RANLIB = @RANLIB@
diff --git a/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref b/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
index 3deb425..5433e40 100644
--- a/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
+++ b/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
@@ -31,7 +31,6 @@ ref_d = ["with_foo"; ..
31 "with_javasci"; .. 31 "with_javasci"; ..
32 "with_macros_source"; .. 32 "with_macros_source"; ..
33 "with_modelica_compiler"; .. 33 "with_modelica_compiler"; ..
34 "with_pvm"; ..
35 "with_texmacs"; .. 34 "with_texmacs"; ..
36 "with_tk"]; 35 "with_tk"];
37if or(a <> ref_a) then bugmes();quit;end 36if or(a <> ref_a) then bugmes();quit;end
diff --git a/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst b/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
index 21b3da8..79e7b66 100644
--- a/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
+++ b/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
@@ -38,7 +38,6 @@ ref_d = ["with_foo"; ..
38 "with_javasci"; .. 38 "with_javasci"; ..
39 "with_macros_source"; .. 39 "with_macros_source"; ..
40 "with_modelica_compiler"; .. 40 "with_modelica_compiler"; ..
41 "with_pvm"; ..
42 "with_texmacs"; .. 41 "with_texmacs"; ..
43 "with_tk"]; 42 "with_tk"];
44 43
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 0655120..b8d750e 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -88,10 +88,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
88 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 88 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
89 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 89 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
90 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 90 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
91 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 91 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
92 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 92 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
93 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 93 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
94 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 94 $(top_srcdir)/configure.ac
95am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 95am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
96 $(ACLOCAL_M4) 96 $(ACLOCAL_M4)
97mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 97mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -393,11 +393,6 @@ PCRE_VERSION = @PCRE_VERSION@
393PKG_CONFIG = @PKG_CONFIG@ 393PKG_CONFIG = @PKG_CONFIG@
394POSUB = @POSUB@ 394POSUB = @POSUB@
395POW_LIB = @POW_LIB@ 395POW_LIB = @POW_LIB@
396PVMGETARCH = @PVMGETARCH@
397PVM_ARCH = @PVM_ARCH@
398PVM_ENABLE = @PVM_ENABLE@
399PVM_INCLUDE = @PVM_INCLUDE@
400PVM_LIB = @PVM_LIB@
401PYTHON = @PYTHON@ 396PYTHON = @PYTHON@
402QDOX = @QDOX@ 397QDOX = @QDOX@
403RANLIB = @RANLIB@ 398RANLIB = @RANLIB@
diff --git a/scilab/modules/core/Makefile.am b/scilab/modules/core/Makefile.am
index 7e01ddc..86c4361 100644
--- a/scilab/modules/core/Makefile.am
+++ b/scilab/modules/core/Makefile.am
@@ -290,7 +290,6 @@ libscicore_la_CFLAGS = -I$(srcdir)/includes/ \
290 -I$(top_srcdir)/modules/io/includes \ 290 -I$(top_srcdir)/modules/io/includes \
291 -I$(top_srcdir)/modules/tclsci/includes \ 291 -I$(top_srcdir)/modules/tclsci/includes \
292 -I$(top_srcdir)/modules/dynamic_link/includes \ 292 -I$(top_srcdir)/modules/dynamic_link/includes \
293 -I$(top_srcdir)/modules/pvm/includes \
294 -I$(top_srcdir)/modules/elementary_functions/includes \ 293 -I$(top_srcdir)/modules/elementary_functions/includes \
295 -I$(top_srcdir)/modules/string/includes \ 294 -I$(top_srcdir)/modules/string/includes \
296 -I$(top_srcdir)/modules/fileio/includes \ 295 -I$(top_srcdir)/modules/fileio/includes \
@@ -325,7 +324,7 @@ libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
325 324
326# Commented because it is easier to comment first the core module 325# Commented because it is easier to comment first the core module
327libscicore_la_LIBADD = libscicore-algo.la 326libscicore_la_LIBADD = libscicore-algo.la
328# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/pvm/libscipvm.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la 327# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
329 328
330#### Target ###### 329#### Target ######
331modulename=core 330modulename=core
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 4b10207..554668c 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -84,10 +84,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
84 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 84 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 85 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
86 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 86 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
87 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 87 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
88 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 88 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
89 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 89 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
90 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 90 $(top_srcdir)/configure.ac
91am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 91am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
92 $(ACLOCAL_M4) 92 $(ACLOCAL_M4)
93mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 93mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -510,11 +510,6 @@ PCRE_VERSION = @PCRE_VERSION@
510PKG_CONFIG = @PKG_CONFIG@ 510PKG_CONFIG = @PKG_CONFIG@
511POSUB = @POSUB@ 511POSUB = @POSUB@
512POW_LIB = @POW_LIB@ 512POW_LIB = @POW_LIB@
513PVMGETARCH = @PVMGETARCH@
514PVM_ARCH = @PVM_ARCH@
515PVM_ENABLE = @PVM_ENABLE@
516PVM_INCLUDE = @PVM_INCLUDE@
517PVM_LIB = @PVM_LIB@
518PYTHON = @PYTHON@ 513PYTHON = @PYTHON@
519QDOX = @QDOX@ 514QDOX = @QDOX@
520RANLIB = @RANLIB@ 515RANLIB = @RANLIB@
@@ -780,7 +775,6 @@ libscicore_la_CFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
780 -I$(top_srcdir)/modules/io/includes \ 775 -I$(top_srcdir)/modules/io/includes \
781 -I$(top_srcdir)/modules/tclsci/includes \ 776 -I$(top_srcdir)/modules/tclsci/includes \
782 -I$(top_srcdir)/modules/dynamic_link/includes \ 777 -I$(top_srcdir)/modules/dynamic_link/includes \
783 -I$(top_srcdir)/modules/pvm/includes \
784 -I$(top_srcdir)/modules/elementary_functions/includes \ 778 -I$(top_srcdir)/modules/elementary_functions/includes \
785 -I$(top_srcdir)/modules/string/includes \ 779 -I$(top_srcdir)/modules/string/includes \
786 -I$(top_srcdir)/modules/fileio/includes \ 780 -I$(top_srcdir)/modules/fileio/includes \
@@ -806,7 +800,7 @@ libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
806 800
807# Commented because it is easier to comment first the core module 801# Commented because it is easier to comment first the core module
808libscicore_la_LIBADD = libscicore-algo.la 802libscicore_la_LIBADD = libscicore-algo.la
809# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/pvm/libscipvm.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la 803# $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/fftw/libscifftw.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/special_functions/libscispecial_functions.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/data_structures/libscidata_structures.la $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/randlib/libscirandlib.la $(top_builddir)/modules/localization/libscilocalization.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/signal_processing/libscisignal_processing.la $(top_builddir)/modules/completion/libscicompletion.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/double/libscidouble.la $(top_builddir)/modules/sound/libscisound.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/graphic_export/libscigraphic_export.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/spreadsheet/libscispreadsheet.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/metanet/libscimetanet.la $(top_builddir)/modules/windows_tools/libsciwindows_tools.la $(top_builddir)/modules/interpolation/libsciinterpolation.la $(top_builddir)/modules/symbolic/libscisymbolic.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/statistics/libscistatistics.la $(top_builddir)/modules/jvm/libscijvm.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/optimization/libscioptimization.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la
810 804
811#### Target ###### 805#### Target ######
812modulename = core 806modulename = core
diff --git a/scilab/modules/core/help/en_US/getversion.xml b/scilab/modules/core/help/en_US/getversion.xml
index b21c9a8..3216b0c 100644
--- a/scilab/modules/core/help/en_US/getversion.xml
+++ b/scilab/modules/core/help/en_US/getversion.xml
@@ -69,7 +69,7 @@ versioninfo = getversion('&lt;module&gt;','string_info')</synopsis>
69 69
70 <listitem> 70 <listitem>
71 <para>a vector of string 71 <para>a vector of string
72 :<literal>[compiler, architecture,[ pvm, tk, modelicac, atlas,] release_mode, release_date, release_time]</literal></para> 72 :<literal>[compiler, architecture,[tk, modelicac, atlas,] release_mode, release_date, release_time]</literal></para>
73 </listitem> 73 </listitem>
74 </varlistentry> 74 </varlistentry>
75 </variablelist> 75 </variablelist>
@@ -80,14 +80,12 @@ versioninfo = getversion('&lt;module&gt;','string_info')</synopsis>
80 80
81 <para>return in <literal>version</literal> the Scilab version name and in 81 <para>return in <literal>version</literal> the Scilab version name and in
82 <literal>opts</literal> build options which can be used to determine if 82 <literal>opts</literal> build options which can be used to determine if
83 scilab has been build with pvm, tk , atlas or modelicac and give release date and time.</para> 83 scilab has been build with tk or modelicac and give release date and time.</para>
84 <para> [ pvm, tk, modelicac, atlas,] are optional. </para> 84 <para> [tk, modelicac,] are optional. </para>
85 <para> compiler: returns compiler used to build scilab ('GCC', 'VC++', 'PGI', 'ICC', 'SUN', 'UKN' unknown)</para> 85 <para> compiler: returns compiler used to build scilab ('GCC', 'VC++', 'PGI', 'ICC', 'SUN', 'UKN' unknown)</para>
86 <para> archicteture: 'x86' or 'x64'.</para> 86 <para> archicteture: 'x86' or 'x64'.</para>
87 <para> pvm: 'pvm' if pvm is enabled.</para>
88 <para> tk: 'tk' if tcl/tk is enabled.</para> 87 <para> tk: 'tk' if tcl/tk is enabled.</para>
89 <para> modelicac: 'modelicac' if modelica compiler is ditributed with scilab/xcos.</para> 88 <para> modelicac: 'modelicac' if modelica compiler is ditributed with scilab/xcos.</para>
90 <para> atlas: 'atlas' if scilab was built with atlas (or MKL).</para>
91 </refsection> 89 </refsection>
92 90
93 <refsection> 91 <refsection>
@@ -100,9 +98,7 @@ getversion()
100COMPILER = opts(1) 98COMPILER = opts(1)
101ARCH = opts(2) 99ARCH = opts(2)
102or(opts == 'modelicac') 100or(opts == 'modelicac')
103or(opts == 'pvm')
104or(opts == 'tk') 101or(opts == 'tk')
105or(opts == 'atlas')
106RELEASE_MODE = opts($-2) 102RELEASE_MODE = opts($-2)
107RELEASE_DATE = opts($-1) 103RELEASE_DATE = opts($-1)
108RELEASE_TIME = opts($) 104RELEASE_TIME = opts($)
diff --git a/scilab/modules/core/help/en_US/with_pvm.xml b/scilab/modules/core/help/en_US/with_pvm.xml
deleted file mode 100644
index 115de14..0000000
--- a/scilab/modules/core/help/en_US/with_pvm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="with_pvm">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_pvm</refname>
8 <refpurpose> Checks if Scilab has been built with the "Parallel Virtual Machine" interface</refpurpose>
9 </refnamediv>
10 <refsynopsisdiv>
11 <title>Calling Sequence</title>
12 <synopsis>r=with_pvm()</synopsis>
13 </refsynopsisdiv>
14 <refsection>
15 <title>Arguments</title>
16 <variablelist>
17 <varlistentry>
18 <term>r</term>
19 <listitem>
20 <para>a boolean</para>
21 </listitem>
22 </varlistentry>
23 </variablelist>
24 </refsection>
25 <refsection>
26 <title>Description</title>
27 <para>Returns <literal>%t</literal> if Scilab has been built with the "Parallel Virtual Machine" interface or <literal>%f</literal> if not.</para>
28 </refsection>
29</refentry>
diff --git a/scilab/modules/core/help/fr_FR/with_pvm.xml b/scilab/modules/core/help/fr_FR/with_pvm.xml
deleted file mode 100644
index 737e7b6..0000000
--- a/scilab/modules/core/help/fr_FR/with_pvm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="fr" xml:id="with_pvm">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_pvm</refname>
8 <refpurpose>Test si Scilab a été compilé avec l'interface "Parallel Virtual Machine"</refpurpose>
9 </refnamediv>
10 <refsynopsisdiv>
11 <title>Séquence d'appel</title>
12 <synopsis>r=with_pvm()</synopsis>
13 </refsynopsisdiv>
14 <refsection>
15 <title>Paramètres</title>
16 <variablelist>
17 <varlistentry>
18 <term>r</term>
19 <listitem>
20 <para>a boolean</para>
21 </listitem>
22 </varlistentry>
23 </variablelist>
24 </refsection>
25 <refsection>
26 <title>Description</title>
27 <para>
28 Retourne <literal>%t</literal> si Scilab a été compilé avec l'interface "Parallel Virtual Machine" ou <literal>%f</literal> sinon.
29 </para>
30 </refsection>
31</refentry>
diff --git a/scilab/modules/core/help/ja_JP/getversion.xml b/scilab/modules/core/help/ja_JP/getversion.xml
index 96412ac..01cb233 100644
--- a/scilab/modules/core/help/ja_JP/getversion.xml
+++ b/scilab/modules/core/help/ja_JP/getversion.xml
@@ -69,7 +69,7 @@ versioninfo=getversion('&lt;module&gt;','string_info')</synopsis>
69 69
70 <listitem> 70 <listitem>
71 <para>7個のエントリを有するベクトル 71 <para>7個のエントリを有するベクトル
72 :<literal>[compiler, pvm, tk, modelicac, release_mode, release_date, release_time]</literal></para> 72 :<literal>[compiler, tk, modelicac, release_mode, release_date, release_time]</literal></para>
73 </listitem> 73 </listitem>
74 </varlistentry> 74 </varlistentry>
75 </variablelist> 75 </variablelist>
@@ -81,7 +81,7 @@ versioninfo=getversion('&lt;module&gt;','string_info')</synopsis>
81 <para>Scilab バージョン名を<literal>version</literal>, 81 <para>Scilab バージョン名を<literal>version</literal>,
82 構築オプションを <literal>opts</literal>に返します. 82 構築オプションを <literal>opts</literal>に返します.
83 この構築オプションは, 83 この構築オプションは,
84 Scilabが pvm, tk または modelica を組み込んで構築されたかどうかを 84 Scilabが tk または modelica を組み込んで構築されたかどうかを
85 定義するために使用され, リリース日や時間も含まれます.</para> 85 定義するために使用され, リリース日や時間も含まれます.</para>
86 </refsection> 86 </refsection>
87 87
diff --git a/scilab/modules/core/help/ja_JP/with_pvm.xml b/scilab/modules/core/help/ja_JP/with_pvm.xml
deleted file mode 100644
index 561943c..0000000
--- a/scilab/modules/core/help/ja_JP/with_pvm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="ja" xml:id="with_pvm">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_pvm</refname>
8 <refpurpose>
9 Scilabに"Parallel Virtual Machine"インターフェイスが
10 組み込まれているかどうかを調べる</refpurpose>
11 </refnamediv>
12 <refsynopsisdiv>
13 <title>呼出し手順</title>
14 <synopsis>r=with_pvm()</synopsis>
15 </refsynopsisdiv>
16 <refsection>
17 <title>パラメータ</title>
18 <variablelist>
19 <varlistentry>
20 <term>r</term>
21 <listitem>
22 <para>論理値</para>
23 </listitem>
24 </varlistentry>
25 </variablelist>
26 </refsection>
27 <refsection>
28 <title>説明</title>
29 <para>
30 Scilabが"Parallel Virtual Machine"インターフェイスと共に
31 構築されている場合に <literal>%t</literal>,
32 そうでない場合に <literal>%f</literal> を返します.</para>
33 </refsection>
34</refentry>
diff --git a/scilab/modules/core/help/pt_BR/getversion.xml b/scilab/modules/core/help/pt_BR/getversion.xml
index 4b61764..c524a2e 100644
--- a/scilab/modules/core/help/pt_BR/getversion.xml
+++ b/scilab/modules/core/help/pt_BR/getversion.xml
@@ -26,9 +26,7 @@
26COMPILER = opts(1) 26COMPILER = opts(1)
27ARCH = opts(2) 27ARCH = opts(2)
28or(opts == 'modelicac') 28or(opts == 'modelicac')
29or(opts == 'pvm')
30or(opts == 'tk') 29or(opts == 'tk')
31or(opts == 'atlas')
32RELEASE_MODE = opts($-2) 30RELEASE_MODE = opts($-2)
33RELEASE_DATE = opts($-1) 31RELEASE_DATE = opts($-1)
34RELEASE_TIME = opts($) 32RELEASE_TIME = opts($)
@@ -81,7 +79,7 @@ versionstr = getversion('overloading','string_info')
81 79
82 <listitem> 80 <listitem>
83 <para>um vetor de strings: 81 <para>um vetor de strings:
84 <literal>[compiler, architecture, [pvm, tk, modelicac, atlas,] release_mode, release_date, release_time]</literal></para> 82 <literal>[compiler, architecture, [tk, modelicac, ] release_mode, release_date, release_time]</literal></para>
85 </listitem> 83 </listitem>
86 </varlistentry> 84 </varlistentry>
87 </variablelist> 85 </variablelist>
@@ -92,7 +90,7 @@ versionstr = getversion('overloading','string_info')
92 90
93 <para>Retorna em <literal>version</literal> o nome da versão do Scilab e 91 <para>Retorna em <literal>version</literal> o nome da versão do Scilab e
94 em <literal>opts</literal> build options ("opções de construção") que 92 em <literal>opts</literal> build options ("opções de construção") que
95 podem ser usadas para determinar se o Scilab foi construído em pvm, tk ou 93 podem ser usadas para determinar se o Scilab foi construído em tk ou
96 modelicac.</para> 94 modelicac.</para>
97 </refsection> 95 </refsection>
98 96
@@ -106,9 +104,7 @@ getversion()
106COMPILER = opts(1) 104COMPILER = opts(1)
107ARCH = opts(2) 105ARCH = opts(2)
108or(opt == 'modelicac') 106or(opt == 'modelicac')
109or(opt == 'pvm')
110or(opt == 'tk') 107or(opt == 'tk')
111or(opt == 'atlas')
112RELEASE_MODE = opts($-2) 108RELEASE_MODE = opts($-2)
113RELEASE_DATE = opts($-1) 109RELEASE_DATE = opts($-1)
114RELEASE_TIME = opts($) 110RELEASE_TIME = opts($)
diff --git a/scilab/modules/core/help/pt_BR/with_pvm.xml b/scilab/modules/core/help/pt_BR/with_pvm.xml
deleted file mode 100644
index c624869..0000000
--- a/scilab/modules/core/help/pt_BR/with_pvm.xml
+++ /dev/null
@@ -1,47 +0,0 @@
1<?xml version="1.0" encoding="ISO-8859-1"?>
2<refentry version="5.0-subset Scilab" xml:id="with_pvm" xml:lang="en"
3 xmlns="http://docbook.org/ns/docbook"
4 xmlns:xlink="http://www.w3.org/1999/xlink"
5 xmlns:svg="http://www.w3.org/2000/svg"
6 xmlns:ns3="http://www.w3.org/1999/xhtml"
7 xmlns:mml="http://www.w3.org/1998/Math/MathML"
8 xmlns:db="http://docbook.org/ns/docbook">
9 <info>
10 <pubdate>$LastChangedDate$</pubdate>
11 </info>
12
13 <refnamediv>
14 <refname>with_pvm</refname>
15
16 <refpurpose>Checa se o Scilab foi construdo com a interface "Parallel
17 Virtual Machine"</refpurpose>
18 </refnamediv>
19
20 <refsynopsisdiv>
21 <title>Seqncia de Chamamento</title>
22
23 <synopsis>r=with_pvm()</synopsis>
24 </refsynopsisdiv>
25
26 <refsection>
27 <title>Parmetros</title>
28
29 <variablelist>
30 <varlistentry>
31 <term>r</term>
32
33 <listitem>
34 <para>um booleano</para>
35 </listitem>
36 </varlistentry>
37 </variablelist>
38 </refsection>
39
40 <refsection>
41 <title>Descrio</title>
42
43 <para>Retorna <literal>%t</literal> se o Scilab tiver sido construdo com
44 a interface "Parallel Virtual Machine", ou <literal>%f</literal>
45 seno.</para>
46 </refsection>
47</refentry>
diff --git a/scilab/modules/core/includes/callinterf.h b/scilab/modules/core/includes/callinterf.h
index 29e804b..ffe2ba5 100644
--- a/scilab/modules/core/includes/callinterf.h
+++ b/scilab/modules/core/includes/callinterf.h
@@ -63,7 +63,7 @@
63/* 39 */ #include "dynamic_gateways.h" /* special_functions */ 63/* 39 */ #include "dynamic_gateways.h" /* special_functions */
64/* 40 */ #include "dynamic_tclsci.h" 64/* 40 */ #include "dynamic_tclsci.h"
65/* 41 */ #include "../../data_structures/includes/gw_data_structures2.h" 65/* 41 */ #include "../../data_structures/includes/gw_data_structures2.h"
66/* 42 */ #include "dynamic_gateways.h" /* pvm */ 66/* 42 gw_user(); FREE */
67/* 43 */ #include "../../integer/includes/gw_integer.h" 67/* 43 */ #include "../../integer/includes/gw_integer.h"
68/* 44 */ #include "../../linear_algebra/includes/gw_linear_algebra2.h" 68/* 44 */ #include "../../linear_algebra/includes/gw_linear_algebra2.h"
69/* 45 */ #include "dynamic_gateways.h" /* scicos */ 69/* 45 */ #include "dynamic_gateways.h" /* scicos */
diff --git a/scilab/modules/core/includes/getversion.h b/scilab/modules/core/includes/getversion.h
index b837e07..80d24e7 100644
--- a/scilab/modules/core/includes/getversion.h
+++ b/scilab/modules/core/includes/getversion.h
@@ -89,12 +89,6 @@ char *getCompilerUsedToBuildScilab(void);
89char *getCompilerArchitecture(void); 89char *getCompilerArchitecture(void);
90 90
91/** 91/**
92* with pvm ?
93* @return TRUE or FALSE
94*/
95BOOL with_pvm(void);
96
97/**
98* with modelica compiler ? 92* with modelica compiler ?
99* @return TRUE or FALSE 93* @return TRUE or FALSE
100*/ 94*/
diff --git a/scilab/modules/core/includes/machine.h.in b/scilab/modules/core/includes/machine.h.in
index 0529d5a..997a645 100644
--- a/scilab/modules/core/includes/machine.h.in
+++ b/scilab/modules/core/includes/machine.h.in
@@ -497,9 +497,6 @@
497/* With OCAML */ 497/* With OCAML */
498#undef WITH_OCAML 498#undef WITH_OCAML
499 499
500/* With PVM */
501#undef WITH_PVM
502
503/* With TK */ 500/* With TK */
504#undef WITH_TK 501#undef WITH_TK
505 502
diff --git a/scilab/modules/core/macros/with_pvm.sci b/scilab/modules/core/macros/with_pvm.sci
index 8808588..35f7147 100644
--- a/scilab/modules/core/macros/with_pvm.sci
+++ b/scilab/modules/core/macros/with_pvm.sci
@@ -1,5 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) INRIA 2// Copyright (C) INRIA
3// Copyright (C) DIGITEO - 2011 - Allan CORNET
3// 4//
4// This file must be used under the terms of the CeCILL. 5// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which 6// This source file is licensed as described in the file COPYING, which
@@ -9,5 +10,6 @@
9 10
10 11
11function r = with_pvm() 12function r = with_pvm()
12 r = with_module('pvm'); 13 warnobsolete('getversion', '5.4.1');
14 r = %F;
13endfunction 15endfunction
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 78edb75..b7ca5a5 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -77,7 +77,7 @@ static OpTab Interfaces[INTERFACES_MAX] = {
77 /* 39 */ {gw_dynamic_special_functions}, 77 /* 39 */ {gw_dynamic_special_functions},
78 /* 40 */ {gw_dynamic_tclsci}, 78 /* 40 */ {gw_dynamic_tclsci},
79 /* 41 */ {gw_data_structures2}, 79 /* 41 */ {gw_data_structures2},
80 /* 42 */ {gw_dynamic_pvm}, 80 /* 42 */ {gw_user}, /* free position may be used */
81 /* 43 */ {gw_integer}, 81 /* 43 */ {gw_integer},
82 /* 44 */ {gw_linear_algebra2}, 82 /* 44 */ {gw_linear_algebra2},
83 /* 45 */ {gw_dynamic_scicos}, 83 /* 45 */ {gw_dynamic_scicos},
diff --git a/scilab/modules/core/src/c/core.vcxproj b/scilab/modules/core/src/c/core.vcxproj
index 1a99db4..c99c022 100644
--- a/scilab/modules/core/src/c/core.vcxproj
+++ b/scilab/modules/core/src/c/core.vcxproj
@@ -74,7 +74,7 @@
74 <ClCompile> 74 <ClCompile>
75 <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> 75 <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
76 <Optimization>Disabled</Optimization> 76 <Optimization>Disabled</Optimization>
77 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 77 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78 <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 78 <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 79 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
80 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 80 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +114,7 @@ cd.. &gt;nul
114 </Midl> 114 </Midl>
115 <ClCompile> 115 <ClCompile>
116 <Optimization>Disabled</Optimization> 116 <Optimization>Disabled</Optimization>
117 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 117 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118 <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 118 <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 119 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
120 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 120 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@ cd.. &gt;nul
154 <Optimization>MaxSpeed</Optimization> 154 <Optimization>MaxSpeed</Optimization>
155 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 155 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
156 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> 156 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
157 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 157 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158 <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 158 <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159 <StringPooling>true</StringPooling> 159 <StringPooling>true</StringPooling>
160 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 160 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -198,7 +198,7 @@ cd.. &gt;nul
198 <Optimization>MaxSpeed</Optimization> 198 <Optimization>MaxSpeed</Optimization>
199 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 199 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
200 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> 200 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
201 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 201 <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
202 <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203 <StringPooling>true</StringPooling> 203 <StringPooling>true</StringPooling>
204 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 204 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/scilab/modules/core/src/c/dynamic_gateways.c b/scilab/modules/core/src/c/dynamic_gateways.c
index 3b4bbe9..d2f8bcf 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.c
+++ b/scilab/modules/core/src/c/dynamic_gateways.c
@@ -33,22 +33,6 @@ int gw_dynamic_special_functions(void)
33 &ptr_gw_special_functions); 33 &ptr_gw_special_functions);
34} 34}
35/*--------------------------------------------------------------------------*/ 35/*--------------------------------------------------------------------------*/
36/* pvm module */
37#define PVM_MODULE_NAME "pvm"
38static DynLibHandle hPvmLib = NULL;
39static PROC_GATEWAY ptr_gw_pvm = NULL;
40static char* dynlibname_pvm = NULL;
41static char* gatewayname_pvm = NULL;
42/*--------------------------------------------------------------------------*/
43int gw_dynamic_pvm(void)
44{
45 return gw_dynamic_generic(PVM_MODULE_NAME,
46 &dynlibname_pvm,
47 &gatewayname_pvm,
48 &hPvmLib,
49 &ptr_gw_pvm);
50}
51/*--------------------------------------------------------------------------*/
52/* helptools module */ 36/* helptools module */
53#define HELPTOOLS_MODULE_NAME "helptools" 37#define HELPTOOLS_MODULE_NAME "helptools"
54static DynLibHandle hHelptoolsLib = NULL; 38static DynLibHandle hHelptoolsLib = NULL;
@@ -408,11 +392,6 @@ void freeAllDynamicGateways(void)
408 &hSpecial_functionsLib, 392 &hSpecial_functionsLib,
409 &ptr_gw_special_functions); 393 &ptr_gw_special_functions);
410 394
411 freeDynamicGateway(&dynlibname_pvm,
412 &gatewayname_pvm,
413 &hPvmLib,
414 &ptr_gw_pvm);
415
416 freeDynamicGateway(&dynlibname_helptools, 395 freeDynamicGateway(&dynlibname_helptools,
417 &gatewayname_helptools, 396 &gatewayname_helptools,
418 &hHelptoolsLib, 397 &hHelptoolsLib,
diff --git a/scilab/modules/core/src/c/dynamic_gateways.h b/scilab/modules/core/src/c/dynamic_gateways.h
index ef5e366..0546480 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.h
+++ b/scilab/modules/core/src/c/dynamic_gateways.h
@@ -33,13 +33,6 @@ int gw_dynamic_special_functions(void);
33int gw_dynamic_ui_data(void); 33int gw_dynamic_ui_data(void);
34 34
35/** 35/**
36* pvm gateway
37* pvm is loaded dynamically at runtime
38* load gw_pvm in SCI/modules/pvm/sci_gateway/gw_pvm.c
39*/
40int gw_dynamic_pvm(void);
41
42/**
43* xcos gateway 36* xcos gateway
44* xcos is loaded dynamically at runtime 37* xcos is loaded dynamically at runtime
45* load gw_xcos in SCI/modules/xcos/sci_gateway/gw_xcos.c 38* load gw_xcos in SCI/modules/xcos/sci_gateway/gw_xcos.c
diff --git a/scilab/modules/core/src/c/getstaticdebuginfo.c b/scilab/modules/core/src/c/getstaticdebuginfo.c
index dc6650b..d1b54b6 100644
--- a/scilab/modules/core/src/c/getstaticdebuginfo.c
+++ b/scilab/modules/core/src/c/getstaticdebuginfo.c
@@ -24,9 +24,6 @@
24 24
25/* 25/*
26Commented for now 26Commented for now
27#ifdef WITH_PVM
28// #include <pvm.h>
29#endif
30 27
31#ifdef WITH_UMFPACK 28#ifdef WITH_UMFPACK
32#ifdef UMFPACK_SUITESPARSE 29#ifdef UMFPACK_SUITESPARSE
@@ -87,12 +84,6 @@ char **getStaticDebugInfo(int *sizeArray)
87#ifdef WITH_FFTW 84#ifdef WITH_FFTW
88 {"FFTW","Enable"}, 85 {"FFTW","Enable"},
89#endif 86#endif
90#ifdef WITH_PVM
91 {"PVM","Enable"},
92#ifdef PVM_VER
93 {"PVM version",PVM_VER},
94#endif
95#endif
96#ifdef PATH_SEPARATOR 87#ifdef PATH_SEPARATOR
97 {"Path separator",PATH_SEPARATOR}, 88 {"Path separator",PATH_SEPARATOR},
98#endif 89#endif
diff --git a/scilab/modules/core/src/c/getversion.c b/scilab/modules/core/src/c/getversion.c
index 44944bd..ddb0b6d 100644
--- a/scilab/modules/core/src/c/getversion.c
+++ b/scilab/modules/core/src/c/getversion.c
@@ -24,8 +24,6 @@
24#include "../../../io/includes/getenvc.h" 24#include "../../../io/includes/getenvc.h"
25/*--------------------------------------------------------------------------*/ 25/*--------------------------------------------------------------------------*/
26#define TCLSCI_MODULE_NAME "tclsci" 26#define TCLSCI_MODULE_NAME "tclsci"
27#define PVM_MODULE_NAME "pvm"
28#define PVM_OPTION_STRING "pvm"
29#define TCLTK_OPTION_STRING "tk" 27#define TCLTK_OPTION_STRING "tk"
30#define MODELICAC_OPTION_STRING "modelicac" 28#define MODELICAC_OPTION_STRING "modelicac"
31#define X86_STRING "x86" 29#define X86_STRING "x86"
@@ -153,20 +151,6 @@ char **getScilabVersionOptions(int *sizeArrayReturned)
153 options[0] = getCompilerUsedToBuildScilab(); 151 options[0] = getCompilerUsedToBuildScilab();
154 options[1] = getCompilerArchitecture(); 152 options[1] = getCompilerArchitecture();
155 153
156 if (with_pvm())
157 {
158 options = REALLOC(options, sizeof(char*) * (nbOptions + 1));
159 if (options)
160 {
161 options[nbOptions] = strdup(PVM_OPTION_STRING);
162 nbOptions++;
163 }
164 else
165 {
166 return NULL;
167 }
168 }
169
170 if (with_tk()) 154 if (with_tk())
171 { 155 {
172 options = REALLOC(options, sizeof(char*) * (nbOptions + 1)); 156 options = REALLOC(options, sizeof(char*) * (nbOptions + 1));
@@ -294,11 +278,6 @@ char *getCompilerArchitecture(void)
294 #endif 278 #endif
295} 279}
296/*--------------------------------------------------------------------------*/ 280/*--------------------------------------------------------------------------*/
297BOOL with_pvm(void)
298{
299 return with_module(PVM_MODULE_NAME);
300}
301/*--------------------------------------------------------------------------*/
302BOOL with_modelica_compiler(void) 281BOOL with_modelica_compiler(void)
303{ 282{
304 char *fullpathModelicac = searchEnv(ModelicacName, "PATH"); 283 char *fullpathModelicac = searchEnv(ModelicacName, "PATH");
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 1fb4f52..bc184a2 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -72,10 +72,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 72 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 73 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 74 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 75 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
76 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 76 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
77 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 77 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 80 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -339,11 +339,6 @@ PCRE_VERSION = @PCRE_VERSION@
339PKG_CONFIG = @PKG_CONFIG@ 339PKG_CONFIG = @PKG_CONFIG@
340POSUB = @POSUB@ 340POSUB = @POSUB@
341POW_LIB = @POW_LIB@ 341POW_LIB = @POW_LIB@
342PVMGETARCH = @PVMGETARCH@
343PVM_ARCH = @PVM_ARCH@
344PVM_ENABLE = @PVM_ENABLE@
345PVM_INCLUDE = @PVM_INCLUDE@
346PVM_LIB = @PVM_LIB@
347PYTHON = @PYTHON@ 342PYTHON = @PYTHON@
348QDOX = @QDOX@ 343QDOX = @QDOX@
349RANLIB = @RANLIB@ 344RANLIB = @RANLIB@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 32d6c2c..f28817b 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -71,10 +71,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
75 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \ 75 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
76 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \ 76 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
77 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 77 $(top_srcdir)/configure.ac
78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 78am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
79 $(ACLOCAL_M4) 79 $(ACLOCAL_M4)
80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 80mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -258,11 +258,6 @@ PCRE_VERSION = @PCRE_VERSION@
258PKG_CONFIG = @PKG_CONFIG@ 258PKG_CONFIG = @PKG_CONFIG@
259POSUB = @POSUB@ 259POSUB = @POSUB@
260POW_LIB = @POW_LIB@ 260POW_LIB = @POW_LIB@
261PVMGETARCH = @PVMGETARCH@
262PVM_ARCH = @PVM_ARCH@
263PVM_ENABLE = @PVM_ENABLE@
264PVM_INCLUDE = @PVM_INCLUDE@
265PVM_LIB = @PVM_LIB@
266PYTHON = @PYTHON@ 261PYTHON = @PYTHON@
267QDOX = @QDOX@ 262QDOX = @QDOX@
268RANLIB = @RANLIB@ 263RANLIB = @RANLIB@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 7c79298..508ed39 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -71,10 +71,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ 71 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \ 72 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \ 73 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \ 74 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
75 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \