summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2011-02-27 17:31:06 +0100
committerVincent COUVERT <vincent.couvert@scilab.org>2011-03-04 14:17:29 +0100
commit7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45 (patch)
tree7f1d9e084385ef49367b61471c7e41112fcfecdc /scilab/modules/intersci
parent8472524f6535ff7bcba8d41ae98c3cecd7dbe14c (diff)
downloadscilab-7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45.zip
scilab-7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45.tar.gz
* Option --without-scicos renamed to --without-xcos
* Bug 7049 fixed - jgraphx version was checked even if the --without-xcos flag is set. Change-Id: I5583a208672fe027705819a8520fa542b4298119
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 8ce8b92..2a8e00c 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -308,7 +308,6 @@ RANLIB = @RANLIB@
308RELOCATABLE = @RELOCATABLE@ 308RELOCATABLE = @RELOCATABLE@
309RT_LIB = @RT_LIB@ 309RT_LIB = @RT_LIB@
310SAXON = @SAXON@ 310SAXON = @SAXON@
311SCICOS_ENABLE = @SCICOS_ENABLE@
312SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 311SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
313SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 312SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
314SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 313SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -334,6 +333,7 @@ USE_NLS = @USE_NLS@
334VERSION = @VERSION@ 333VERSION = @VERSION@
335WITH_OCAML = @WITH_OCAML@ 334WITH_OCAML = @WITH_OCAML@
336WITH_TKSCI = @WITH_TKSCI@ 335WITH_TKSCI = @WITH_TKSCI@
336XCOS_ENABLE = @XCOS_ENABLE@
337XGETTEXT = @XGETTEXT@ 337XGETTEXT = @XGETTEXT@
338XGETTEXT_015 = @XGETTEXT_015@ 338XGETTEXT_015 = @XGETTEXT_015@
339XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 339XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@