summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
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/compatibility_functions
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/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 74e8de8..02eadad 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
78 $(ACLOCAL_M4) 78 $(ACLOCAL_M4)
79mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 79mkinstalldirs = $(install_sh) -d
80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
81CONFIG_CLEAN_FILES = 81CONFIG_CLEAN_FILES =
82CONFIG_CLEAN_VPATH_FILES = 82CONFIG_CLEAN_VPATH_FILES =
@@ -152,9 +152,11 @@ FGREP = @FGREP@
152FLEXDOCK = @FLEXDOCK@ 152FLEXDOCK = @FLEXDOCK@
153FLIBS = @FLIBS@ 153FLIBS = @FLIBS@
154FOP = @FOP@ 154FOP = @FOP@
155GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
155GIWS_BIN = @GIWS_BIN@ 156GIWS_BIN = @GIWS_BIN@
156GLUEGEN_RT = @GLUEGEN_RT@ 157GLUEGEN_RT = @GLUEGEN_RT@
157GMSGFMT = @GMSGFMT@ 158GMSGFMT = @GMSGFMT@
159GMSGFMT_015 = @GMSGFMT_015@
158GRAPHICS_ENABLE = @GRAPHICS_ENABLE@ 160GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
159GREP = @GREP@ 161GREP = @GREP@
160GUI_ENABLE = @GUI_ENABLE@ 162GUI_ENABLE = @GUI_ENABLE@
@@ -207,9 +209,9 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
207MATIO_ENABLE = @MATIO_ENABLE@ 209MATIO_ENABLE = @MATIO_ENABLE@
208MATIO_LIBS = @MATIO_LIBS@ 210MATIO_LIBS = @MATIO_LIBS@
209MKDIR_P = @MKDIR_P@ 211MKDIR_P = @MKDIR_P@
210MKINSTALLDIRS = @MKINSTALLDIRS@
211MSGCAT = @MSGCAT@ 212MSGCAT = @MSGCAT@
212MSGFMT = @MSGFMT@ 213MSGFMT = @MSGFMT@
214MSGFMT_015 = @MSGFMT_015@
213MSGMERGE = @MSGMERGE@ 215MSGMERGE = @MSGMERGE@
214NM = @NM@ 216NM = @NM@
215NMEDIT = @NMEDIT@ 217NMEDIT = @NMEDIT@
@@ -227,6 +229,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
227PACKAGE_NAME = @PACKAGE_NAME@ 229PACKAGE_NAME = @PACKAGE_NAME@
228PACKAGE_STRING = @PACKAGE_STRING@ 230PACKAGE_STRING = @PACKAGE_STRING@
229PACKAGE_TARNAME = @PACKAGE_TARNAME@ 231PACKAGE_TARNAME = @PACKAGE_TARNAME@
232PACKAGE_URL = @PACKAGE_URL@
230PACKAGE_VERSION = @PACKAGE_VERSION@ 233PACKAGE_VERSION = @PACKAGE_VERSION@
231PATH_SEPARATOR = @PATH_SEPARATOR@ 234PATH_SEPARATOR = @PATH_SEPARATOR@
232PCRE_CFLAGS = @PCRE_CFLAGS@ 235PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -268,6 +271,8 @@ VERSION = @VERSION@
268WITH_OCAML = @WITH_OCAML@ 271WITH_OCAML = @WITH_OCAML@
269WITH_TKSCI = @WITH_TKSCI@ 272WITH_TKSCI = @WITH_TKSCI@
270XGETTEXT = @XGETTEXT@ 273XGETTEXT = @XGETTEXT@
274XGETTEXT_015 = @XGETTEXT_015@
275XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
271XMKMF = @XMKMF@ 276XMKMF = @XMKMF@
272XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@ 277XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
273XML_APIS_EXT = @XML_APIS_EXT@ 278XML_APIS_EXT = @XML_APIS_EXT@