summaryrefslogtreecommitdiffstats
path: root/scilab/modules/texmacs
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/texmacs
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/texmacs')
-rw-r--r--scilab/modules/texmacs/Makefile.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 625bbc3..9510e5d 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -120,6 +120,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
120AWK = @AWK@ 120AWK = @AWK@
121BATIK = @BATIK@ 121BATIK = @BATIK@
122BLAS_LIBS = @BLAS_LIBS@ 122BLAS_LIBS = @BLAS_LIBS@
123BSH = @BSH@
123CC = @CC@ 124CC = @CC@
124CCDEPMODE = @CCDEPMODE@ 125CCDEPMODE = @CCDEPMODE@
125CFLAGS = @CFLAGS@ 126CFLAGS = @CFLAGS@
@@ -193,6 +194,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
193JOGL = @JOGL@ 194JOGL = @JOGL@
194JROSETTA_API = @JROSETTA_API@ 195JROSETTA_API = @JROSETTA_API@
195JROSETTA_ENGINE = @JROSETTA_ENGINE@ 196JROSETTA_ENGINE = @JROSETTA_ENGINE@
197JUNIT = @JUNIT@
196LAPACK_LIBS = @LAPACK_LIBS@ 198LAPACK_LIBS = @LAPACK_LIBS@
197LD = @LD@ 199LD = @LD@
198LDFLAGS = @LDFLAGS@ 200LDFLAGS = @LDFLAGS@
@@ -249,6 +251,7 @@ PVM_ENABLE = @PVM_ENABLE@
249PVM_INCLUDE = @PVM_INCLUDE@ 251PVM_INCLUDE = @PVM_INCLUDE@
250PVM_LIB = @PVM_LIB@ 252PVM_LIB = @PVM_LIB@
251PYTHON = @PYTHON@ 253PYTHON = @PYTHON@
254QDOX = @QDOX@
252RANLIB = @RANLIB@ 255RANLIB = @RANLIB@
253RELOCATABLE = @RELOCATABLE@ 256RELOCATABLE = @RELOCATABLE@
254RT_LIB = @RT_LIB@ 257RT_LIB = @RT_LIB@
@@ -267,6 +270,7 @@ SWIG_JAVA = @SWIG_JAVA@
267SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 270SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
268TCLTK_LIBS = @TCLTK_LIBS@ 271TCLTK_LIBS = @TCLTK_LIBS@
269TCL_INC_PATH = @TCL_INC_PATH@ 272TCL_INC_PATH = @TCL_INC_PATH@
273TESTNG = @TESTNG@
270TK_INC_PATH = @TK_INC_PATH@ 274TK_INC_PATH = @TK_INC_PATH@
271UMFPACK_ENABLE = @UMFPACK_ENABLE@ 275UMFPACK_ENABLE = @UMFPACK_ENABLE@
272UMFPACK_LIB = @UMFPACK_LIB@ 276UMFPACK_LIB = @UMFPACK_LIB@