summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-01 17:01:11 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-01 17:01:11 +0200
commit2fb4ff7896b16475eee5c91aa1f36d455edb81f1 (patch)
treea9493feb506117c88c49468ea56aaf3fbd50d581 /scilab/modules/intersci
parent918ab33f833c1830fd9d2a9714ae126481db9c31 (diff)
parent7734774190cf0720862b0b15c26fc2c875ea113a (diff)
downloadscilab-2fb4ff7896b16475eee5c91aa1f36d455edb81f1.zip
scilab-2fb4ff7896b16475eee5c91aa1f36d455edb81f1.tar.gz
Merge commit 'origin/master' into scilab-macosx
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 5689522..cea517a 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -78,7 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 78 $(top_srcdir)/m4/umfpack.m4 $(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 = $(install_sh) -d
82CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 82CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
83CONFIG_CLEAN_FILES = 83CONFIG_CLEAN_FILES =
84CONFIG_CLEAN_VPATH_FILES = 84CONFIG_CLEAN_VPATH_FILES =
@@ -188,9 +188,11 @@ FGREP = @FGREP@
188FLEXDOCK = @FLEXDOCK@ 188FLEXDOCK = @FLEXDOCK@
189FLIBS = @FLIBS@ 189FLIBS = @FLIBS@
190FOP = @FOP@ 190FOP = @FOP@
191GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
191GIWS_BIN = @GIWS_BIN@ 192GIWS_BIN = @GIWS_BIN@
192GLUEGEN_RT = @GLUEGEN_RT@ 193GLUEGEN_RT = @GLUEGEN_RT@
193GMSGFMT = @GMSGFMT@ 194GMSGFMT = @GMSGFMT@
195GMSGFMT_015 = @GMSGFMT_015@
194GRAPHICS_ENABLE = @GRAPHICS_ENABLE@ 196GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
195GREP = @GREP@ 197GREP = @GREP@
196GUI_ENABLE = @GUI_ENABLE@ 198GUI_ENABLE = @GUI_ENABLE@
@@ -243,9 +245,9 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
243MATIO_ENABLE = @MATIO_ENABLE@ 245MATIO_ENABLE = @MATIO_ENABLE@
244MATIO_LIBS = @MATIO_LIBS@ 246MATIO_LIBS = @MATIO_LIBS@
245MKDIR_P = @MKDIR_P@ 247MKDIR_P = @MKDIR_P@
246MKINSTALLDIRS = @MKINSTALLDIRS@
247MSGCAT = @MSGCAT@ 248MSGCAT = @MSGCAT@
248MSGFMT = @MSGFMT@ 249MSGFMT = @MSGFMT@
250MSGFMT_015 = @MSGFMT_015@
249MSGMERGE = @MSGMERGE@ 251MSGMERGE = @MSGMERGE@
250NM = @NM@ 252NM = @NM@
251NMEDIT = @NMEDIT@ 253NMEDIT = @NMEDIT@
@@ -263,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
263PACKAGE_NAME = @PACKAGE_NAME@ 265PACKAGE_NAME = @PACKAGE_NAME@
264PACKAGE_STRING = @PACKAGE_STRING@ 266PACKAGE_STRING = @PACKAGE_STRING@
265PACKAGE_TARNAME = @PACKAGE_TARNAME@ 267PACKAGE_TARNAME = @PACKAGE_TARNAME@
268PACKAGE_URL = @PACKAGE_URL@
266PACKAGE_VERSION = @PACKAGE_VERSION@ 269PACKAGE_VERSION = @PACKAGE_VERSION@
267PATH_SEPARATOR = @PATH_SEPARATOR@ 270PATH_SEPARATOR = @PATH_SEPARATOR@
268PCRE_CFLAGS = @PCRE_CFLAGS@ 271PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -304,6 +307,8 @@ VERSION = @VERSION@
304WITH_OCAML = @WITH_OCAML@ 307WITH_OCAML = @WITH_OCAML@
305WITH_TKSCI = @WITH_TKSCI@ 308WITH_TKSCI = @WITH_TKSCI@
306XGETTEXT = @XGETTEXT@ 309XGETTEXT = @XGETTEXT@
310XGETTEXT_015 = @XGETTEXT_015@
311XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
307XMKMF = @XMKMF@ 312XMKMF = @XMKMF@
308XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@ 313XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
309XML_APIS_EXT = @XML_APIS_EXT@ 314XML_APIS_EXT = @XML_APIS_EXT@