summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/compatibility_functions
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 50dbef6..d58ea36 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -123,6 +123,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
123AWK = @AWK@ 123AWK = @AWK@
124BATIK = @BATIK@ 124BATIK = @BATIK@
125BLAS_LIBS = @BLAS_LIBS@ 125BLAS_LIBS = @BLAS_LIBS@
126BSH = @BSH@
126CC = @CC@ 127CC = @CC@
127CCDEPMODE = @CCDEPMODE@ 128CCDEPMODE = @CCDEPMODE@
128CFLAGS = @CFLAGS@ 129CFLAGS = @CFLAGS@
@@ -196,6 +197,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
196JOGL = @JOGL@ 197JOGL = @JOGL@
197JROSETTA_API = @JROSETTA_API@ 198JROSETTA_API = @JROSETTA_API@
198JROSETTA_ENGINE = @JROSETTA_ENGINE@ 199JROSETTA_ENGINE = @JROSETTA_ENGINE@
200JUNIT = @JUNIT@
199LAPACK_LIBS = @LAPACK_LIBS@ 201LAPACK_LIBS = @LAPACK_LIBS@
200LD = @LD@ 202LD = @LD@
201LDFLAGS = @LDFLAGS@ 203LDFLAGS = @LDFLAGS@
@@ -252,6 +254,7 @@ PVM_ENABLE = @PVM_ENABLE@
252PVM_INCLUDE = @PVM_INCLUDE@ 254PVM_INCLUDE = @PVM_INCLUDE@
253PVM_LIB = @PVM_LIB@ 255PVM_LIB = @PVM_LIB@
254PYTHON = @PYTHON@ 256PYTHON = @PYTHON@
257QDOX = @QDOX@
255RANLIB = @RANLIB@ 258RANLIB = @RANLIB@
256RELOCATABLE = @RELOCATABLE@ 259RELOCATABLE = @RELOCATABLE@
257RT_LIB = @RT_LIB@ 260RT_LIB = @RT_LIB@
@@ -270,6 +273,7 @@ SWIG_JAVA = @SWIG_JAVA@
270SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 273SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
271TCLTK_LIBS = @TCLTK_LIBS@ 274TCLTK_LIBS = @TCLTK_LIBS@
272TCL_INC_PATH = @TCL_INC_PATH@ 275TCL_INC_PATH = @TCL_INC_PATH@
276TESTNG = @TESTNG@
273TK_INC_PATH = @TK_INC_PATH@ 277TK_INC_PATH = @TK_INC_PATH@
274UMFPACK_ENABLE = @UMFPACK_ENABLE@ 278UMFPACK_ENABLE = @UMFPACK_ENABLE@
275UMFPACK_LIB = @UMFPACK_LIB@ 279UMFPACK_LIB = @UMFPACK_LIB@