* Force the usage of the dynamic stack on all !Windows 12/13012/5
Sylvestre Ledru [Sat, 26 Oct 2013 13:45:02 +0000 (15:45 +0200)]
Otherwise, it breaks all platforms not using the dynamic stack and gcc 4.8

Change-Id: I54bc9ee2f9b2d77ef131738ee5b940f861cb7e77

scilab/configure
scilab/configure.ac
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/stack-def.h
scilab/modules/core/includes/stack.h [moved from scilab/modules/core/includes/stack.h.in with 90% similarity]
scilab/modules/core/src/c/getmaxMALLOC.c
scilab/modules/core/src/c/scimem.c
scilab/modules/core/src/c/stackinfo.c
scilab/modules/javasci/Makefile.in

index d8a2ff7..eee5d25 100755 (executable)
@@ -658,7 +658,6 @@ ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
-SED
 LIBTOOL
 GRAPHICS_ENABLE
 DEMOTOOLS_ENABLE
@@ -756,6 +755,7 @@ GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 POW_LIB
 LIBM
 GUI_ENABLE
@@ -833,8 +833,6 @@ EXTERNAL_SCIRENDERER_TRUE
 HDF5_CFLAGS
 HDF5_LIBS
 NM
-USE_DYNAMIC_STACK_FALSE
-USE_DYNAMIC_STACK_TRUE
 IS_64_BITS_CPU_FALSE
 IS_64_BITS_CPU_TRUE
 CODE_COVERAGE_FALSE
@@ -10081,9 +10079,6 @@ if test $IS_64_BITS_CPU = true -o "$MACOSX" = "1"; then
    if test $f90compatible = false; then
       as_fn_error $? "64 bits support needs a fortran 90 compiler (try --with-gfortran)." "$LINENO" 5
    fi
-
-$as_echo "#define USE_DYNAMIC_STACK /**/" >>confdefs.h
-
 fi
 
  if test $IS_64_BITS_CPU = true; then
@@ -10094,14 +10089,6 @@ else
   IS_64_BITS_CPU_FALSE=
 fi
 
- if test $IS_64_BITS_CPU = true -o "$MACOSX" = "1"; then
-  USE_DYNAMIC_STACK_TRUE=
-  USE_DYNAMIC_STACK_FALSE='#'
-else
-  USE_DYNAMIC_STACK_TRUE='#'
-  USE_DYNAMIC_STACK_FALSE=
-fi
-
 
 ################
 ## SSE
@@ -11054,7 +11041,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 11057 "configure"
+// #line 11044 "configure"
 import java.util.regex.Pattern;
 
 
@@ -11141,7 +11128,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 11144 "configure"
+// #line 11131 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -11225,7 +11212,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 11228 "configure"
+// #line 11215 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -11290,7 +11277,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 11293 "configure"
+// #line 11280 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -11355,7 +11342,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 11358 "configure"
+// #line 11345 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -11420,7 +11407,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 11423 "configure"
+// #line 11410 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -12798,7 +12785,7 @@ $as_echo_n "checking jgraphx... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12801 "configure"
+// #line 12788 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.model.mxCell;
@@ -12905,7 +12892,7 @@ $as_echo_n "checking minimal version (2.0.0.1) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12908 "configure"
+// #line 12895 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -12977,7 +12964,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12980 "configure"
+// #line 12967 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -13071,7 +13058,7 @@ $as_echo_n "checking scirenderer... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13074 "configure"
+// #line 13061 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13178,7 +13165,7 @@ $as_echo_n "checking minimal version (1.1.0) of scirenderer... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13181 "configure"
+// #line 13168 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13250,7 +13237,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13253 "configure"
+// #line 13240 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13349,7 +13336,7 @@ $as_echo_n "checking flexdock... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13352 "configure"
+// #line 13339 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.docking.DockingManager;
@@ -13456,7 +13443,7 @@ $as_echo_n "checking minimal version (1.2.4) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13459 "configure"
+// #line 13446 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13528,7 +13515,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13531 "configure"
+// #line 13518 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13619,7 +13606,7 @@ $as_echo_n "checking looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13622 "configure"
+// #line 13609 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13736,7 +13723,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13739 "configure"
+// #line 13726 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13854,7 +13841,7 @@ $as_echo_n "checking skinlf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13857 "configure"
+// #line 13844 "configure"
 import java.util.regex.Pattern;
 
 import com.l2fprod.util.AccessUtils;
@@ -13971,7 +13958,7 @@ $as_echo_n "checking jogl2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13974 "configure"
+// #line 13961 "configure"
 import java.util.regex.Pattern;
 
 import javax.media.opengl.glu.GLUnurbs;
@@ -14194,7 +14181,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14197 "configure"
+// #line 14184 "configure"
 import java.util.regex.Pattern;
 
 import jogamp.common.os.MachineDescriptionRuntime;
@@ -14368,7 +14355,7 @@ $as_echo_n "checking jhall... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14371 "configure"
+// #line 14358 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14485,7 +14472,7 @@ $as_echo_n "checking javahelp2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14488 "configure"
+// #line 14475 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14603,7 +14590,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14606 "configure"
+// #line 14593 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14718,7 +14705,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14721 "configure"
+// #line 14708 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14836,7 +14823,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14839 "configure"
+// #line 14826 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -14942,7 +14929,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14945 "configure"
+// #line 14932 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15014,7 +15001,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15017 "configure"
+// #line 15004 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15107,7 +15094,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15110 "configure"
+// #line 15097 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.jeuclid.LayoutContext;
@@ -15226,7 +15213,7 @@ $as_echo_n "checking fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15229 "configure"
+// #line 15216 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.fop.pdf.PDFInfo;
@@ -15343,7 +15330,7 @@ $as_echo_n "checking batik-all... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15346 "configure"
+// #line 15333 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15460,7 +15447,7 @@ $as_echo_n "checking batik... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15463 "configure"
+// #line 15450 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15567,7 +15554,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15570 "configure"
+// #line 15557 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15639,7 +15626,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15642 "configure"
+// #line 15629 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15730,7 +15717,7 @@ $as_echo_n "checking commons-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15733 "configure"
+// #line 15720 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.output.CountingOutputStream;
@@ -15847,7 +15834,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15850 "configure"
+// #line 15837 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.xmlgraphics.util.Service;
@@ -15964,7 +15951,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15967 "configure"
+// #line 15954 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -16081,7 +16068,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16084 "configure"
+// #line 16071 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16198,7 +16185,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16201 "configure"
+// #line 16188 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16319,7 +16306,7 @@ $as_echo_n "checking commons-logging... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16322 "configure"
+// #line 16309 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
@@ -16436,7 +16423,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16439 "configure"
+// #line 16426 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16543,7 +16530,7 @@ $as_echo_n "checking minimal version (1.0.2) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 16546 "configure"
+// #line 16533 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16615,7 +16602,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 16618 "configure"
+// #line 16605 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16706,7 +16693,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16709 "configure"
+// #line 16696 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -16829,7 +16816,7 @@ $as_echo_n "checking checkstyle... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16832 "configure"
+// #line 16819 "configure"
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -16946,7 +16933,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16949 "configure"
+// #line 16936 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.beanutils.Converter;
@@ -17063,7 +17050,7 @@ $as_echo_n "checking antlr... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17066 "configure"
+// #line 17053 "configure"
 import java.util.regex.Pattern;
 
 import antlr.TokenStreamException;
@@ -17180,7 +17167,7 @@ $as_echo_n "checking junit4... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17183 "configure"
+// #line 17170 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -17297,7 +17284,7 @@ $as_echo_n "checking cobertura... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17300 "configure"
+// #line 17287 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.cobertura.merge.Main;
@@ -17414,7 +17401,7 @@ $as_echo_n "checking asm3... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17417 "configure"
+// #line 17404 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -17530,7 +17517,7 @@ $as_echo_n "checking asm... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17533 "configure"
+// #line 17520 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -17646,7 +17633,7 @@ $as_echo_n "checking ecj... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17649 "configure"
+// #line 17636 "configure"
 import java.util.regex.Pattern;
 
 import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
 #######################
 
 # gettext.  See http://www.gnu.org/software/hello/manual/gettext/AM_005fGNU_005fGETTEXT.html
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -19120,15 +19169,14 @@ $as_echo "$USE_NLS" >&6; }
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -19553,7 +19599,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -20082,15 +20128,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
@@ -20148,14 +20198,16 @@ else
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
@@ -20170,14 +20222,16 @@ rm -f core conftest.err conftest.$ac_objext \
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
@@ -20201,15 +20255,17 @@ if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
+
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20218,6 +20274,7 @@ else
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -20234,7 +20291,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -20253,7 +20311,27 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -20272,7 +20350,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -20286,8 +20365,8 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
+    result |= 16;
+  return result;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -20404,7 +20483,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -20802,6 +20881,7 @@ else
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -20810,11 +20890,14 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
@@ -20830,6 +20913,7 @@ rm -f core conftest.err conftest.$ac_objext \
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -20838,19 +20922,22 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -26029,7 +26116,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 26032 "configure"
+#line 26119 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -26340,7 +26427,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 26343 "configure"
+#line 26430 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -26924,7 +27011,7 @@ $as_echo_n "checking saxon9he... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 26927 "configure"
+// #line 27014 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -27039,7 +27126,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 27042 "configure"
+// #line 27129 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -27155,7 +27242,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 27158 "configure"
+// #line 27245 "configure"
 import java.util.regex.Pattern;
 
 import com.icl.saxon.Loader;
@@ -33582,7 +33669,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 33585 "configure"
+#line 33672 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -33688,7 +33775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 33691 "configure"
+#line 33778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
 # This script is used by Xcos in order to regenerate the function/block list
 
 
-# Generate stack.h
-if test "$IS_64_BITS_CPU" = true -o "$MACOSX" = "1"; then
-   stack_h_cpp_flags=-DUSE_DYNAMIC_STACK
-else
-   stack_h_cpp_flags=
-fi
-
-ac_config_commands="$ac_config_commands modules/core/includes/stack.h"
-
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -40444,10 +40521,6 @@ if test -z "${IS_64_BITS_CPU_TRUE}" && test -z "${IS_64_BITS_CPU_FALSE}"; then
   as_fn_error $? "conditional \"IS_64_BITS_CPU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_DYNAMIC_STACK_TRUE}" && test -z "${USE_DYNAMIC_STACK_FALSE}"; then
-  as_fn_error $? "conditional \"USE_DYNAMIC_STACK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${EXTERNAL_SCIRENDERER_TRUE}" && test -z "${EXTERNAL_SCIRENDERER_FALSE}"; then
   as_fn_error $? "conditional \"EXTERNAL_SCIRENDERER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 
 
 
-CPP="$CPP"
-   GREP="$GREP"
-   stack_h_cpp_flags="$stack_h_cpp_flags"
-
 
 _ACEOF
 
@@ -41688,7 +41757,6 @@ do
     "modules/helptools/etc/SciDocConf.xml") CONFIG_FILES="$CONFIG_FILES modules/helptools/etc/SciDocConf.xml" ;;
     "modules/core/includes/version.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/version.h" ;;
     "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;;
-    "modules/core/includes/stack.h") CONFIG_COMMANDS="$CONFIG_COMMANDS modules/core/includes/stack.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -42387,7 +42455,7 @@ $as_echo X"$file" |
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -42403,7 +42471,8 @@ $as_echo X"$file" |
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[  ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -42414,12 +42483,12 @@ $as_echo X"$file" |
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -43457,10 +43526,6 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 _LT_EOF
 
  ;;
-    "modules/core/includes/stack.h":C) if ! $CPP $stack_h_cpp_flags - < $srcdir/modules/core/includes/stack.h.in |\
-              $GREP -v '^#' > $srcdir/modules/core/includes/stack.h ; then
-     as_fn_error $? "stack.h generation failed" "$LINENO" 5
-   fi ;;
 
   esac
 done # for ac_tag
index adb6446..f23181b 100644 (file)
@@ -702,11 +702,9 @@ if test $IS_64_BITS_CPU = true -o "$MACOSX" = "1"; then
    if test $f90compatible = false; then
       AC_MSG_ERROR([64 bits support needs a fortran 90 compiler (try --with-gfortran).])
    fi
-   AC_DEFINE([USE_DYNAMIC_STACK], [], [If we are building a 64 bits version])
 fi
 
 AM_CONDITIONAL(IS_64_BITS_CPU, test $IS_64_BITS_CPU = true)
-AM_CONDITIONAL(USE_DYNAMIC_STACK, test $IS_64_BITS_CPU = true -o "$MACOSX" = "1")
 
 ################
 ## SSE
@@ -1957,23 +1955,6 @@ fi
 # This script is used by Xcos in order to regenerate the function/block list
 AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure])
 
-# Generate stack.h
-if test "$IS_64_BITS_CPU" = true -o "$MACOSX" = "1"; then
-   stack_h_cpp_flags=-DUSE_DYNAMIC_STACK
-else
-   stack_h_cpp_flags=
-fi
-
-AC_CONFIG_COMMANDS([modules/core/includes/stack.h],
-  [if ! $CPP $stack_h_cpp_flags - < $srcdir/modules/core/includes/stack.h.in |\
-              $GREP -v '^#' > $srcdir/modules/core/includes/stack.h ; then
-     AC_MSG_ERROR([stack.h generation failed])
-   fi],
-  [CPP="$CPP"
-   GREP="$GREP"
-   stack_h_cpp_flags="$stack_h_cpp_flags"
-  ])
-
 AC_OUTPUT
 
 # To distribution packager, you can uncomment this stuff is you want to
index 5319b34..7e7d770 100644 (file)
@@ -99,7 +99,8 @@ src/c/getmaxMALLOC.c \
 src/c/sci_mem_alloc.c \
 src/c/hashtable/hashtable.c \
 src/c/hashtable/hashtable_itr.c \
-src/c/hashtable/hashtable_utility.c
+src/c/hashtable/hashtable_utility.c \
+src/c/scimem64.c
 
 CORE_CXX_SOURCES = src/cpp/hashtable_core.cpp \
 src/cpp/namstr.cpp \
@@ -107,9 +108,7 @@ src/cpp/search_functions.cpp \
 src/cpp/demangle.cpp \
 src/cpp/backtrace_print.cpp
 
-if USE_DYNAMIC_STACK
-CORE_C_SOURCES += src/c/scimem64.c
-endif
+
 
 CORE_FORTRAN_SOURCES = src/fortran/clunit.f \
 src/fortran/getlin.f \
@@ -194,11 +193,8 @@ src/fortran/itosci.f \
 src/fortran/stackr2d.f \
 src/fortran/stacki2d.f \
 src/fortran/stackc2i.f \
-src/fortran/isinstring.f
-
-if USE_DYNAMIC_STACK
-CORE_FORTRAN_SOURCES += src/fortran/relocstack.f
-endif
+src/fortran/isinstring.f \
+src/fortran/relocstack.f
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_stacksize.c \
 sci_gateway/c/sci_resume.c \
index b79c55a..215c4fd 100644 (file)
@@ -105,17 +105,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@USE_DYNAMIC_STACK_TRUE@am__append_1 = src/c/scimem64.c
-@USE_DYNAMIC_STACK_TRUE@am__append_2 = src/fortran/relocstack.f
 
 # Used by sci_getdebuginfo:
-@TCLTK_TRUE@am__append_3 = $(TCL_INC_PATH) \
+@TCLTK_TRUE@am__append_1 = $(TCL_INC_PATH) \
 @TCLTK_TRUE@                             $(TK_INC_PATH)
 
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
        $(top_srcdir)/config/depcomp $(libscicore_la_include_HEADERS)
-@NEED_JAVA_TRUE@am__append_4 = java
+@NEED_JAVA_TRUE@am__append_2 = java
 subdir = modules/core
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -176,82 +174,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscicore_la_includedir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscicore_algo_la_LIBADD =
-am__libscicore_algo_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
-       src/c/tmpdir.c src/c/intmacr2tree.c src/c/run.c \
-       src/c/InitScilab.c src/c/getval.c src/c/md5.c src/c/inisci-c.c \
-       src/c/IsAScalar.c src/c/texmacs.c src/c/sciquit.c \
-       src/c/stack1.c src/c/realmain.c src/c/stack3.c src/c/str2sci.c \
-       src/c/getmodules.c src/c/setgetSCIpath.c src/c/getmemory.c \
-       src/c/Funtab.c src/c/csignal.c src/c/callinterf.c \
-       src/c/scimem.c src/c/banier.c src/c/isanan.c src/c/parse.c \
-       src/c/stack2.c src/c/xscion.c src/c/SetScilabEnvironment.c \
-       src/c/returnanan.c src/c/LoadFunctionsTab.c \
-       src/c/with_module.c src/c/loadversion.c src/c/version.c \
-       src/c/stackinfo.c src/c/scirun.c src/c/SCIHOME.c \
-       src/c/warningmode.c src/c/InitializeCore.c \
-       src/c/TerminateCore.c src/c/coretable.c src/c/returnProperty.c \
-       src/c/returnPropertyList.c src/c/scilabmode.c \
-       src/c/GetXmlFileEncoding.c src/c/islittleendian.c \
-       src/c/terme.c src/c/ifexpr.c src/c/expr.c \
-       src/c/getcommandlineargs.c src/c/syncexec.c \
-       src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
-       src/c/commandwords.c src/c/freeArrayOfString.c \
-       src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
-       src/c/callDynamicGateway.c src/c/gw_dynamic_generic.c \
-       src/c/dynamic_gateways.c src/c/readGateway.c \
-       src/c/comparehandles.c src/c/setPrecisionFPU.c \
-       src/c/LaunchScilabSignal.c src/c/getos.c src/c/mode_exec.c \
-       src/c/predef.c src/c/transposeMatrix.c \
-       src/c/recursionFunction.c src/c/typename.c \
-       src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
-       src/c/exitCodeValue.c src/c/getversion.c \
-       src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
-       src/c/storeCommand.c src/c/backtrace.c src/c/signal_mgmt.c \
-       src/c/suspendProcess.c src/c/setieee.c src/c/setlines.c \
-       src/c/setformat.c src/c/InitializePreferences.c \
-       src/c/sci_tools.c src/c/getmaxMALLOC.c src/c/sci_mem_alloc.c \
-       src/c/hashtable/hashtable.c src/c/hashtable/hashtable_itr.c \
-       src/c/hashtable/hashtable_utility.c src/c/scimem64.c \
-       src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
-       src/cpp/search_functions.cpp src/cpp/demangle.cpp \
-       src/cpp/backtrace_print.cpp src/fortran/clunit.f \
-       src/fortran/getlin.f src/fortran/allowptr.f \
-       src/fortran/isany.f src/fortran/hmcreate.f src/fortran/nextj.f \
-       src/fortran/setgetmode.f src/fortran/showstack.f \
-       src/fortran/misops.f src/fortran/setippty.f \
-       src/fortran/compil.f src/fortran/funnam.f src/fortran/cmdstr.f \
-       src/fortran/hndlops.f src/fortran/cmplxt.f \
-       src/fortran/skpins.f src/fortran/folhp.f src/fortran/cvname.f \
-       src/fortran/funs.f src/fortran/fact.f src/fortran/typ2cod.f \
-       src/fortran/prompt.f src/fortran/intstr.f \
-       src/fortran/createref.f src/fortran/btof.f \
-       src/fortran/getnum.f src/fortran/btofm.f src/fortran/getsym.f \
-       src/fortran/findequal.f src/fortran/stackg.f \
-       src/fortran/find.f src/fortran/setlnb.f src/fortran/mrknmd.f \
-       src/fortran/stackgl.f src/fortran/allops.f src/fortran/mname.f \
-       src/fortran/command.f src/fortran/ref2val.f \
-       src/fortran/stack.f src/fortran/isbrk.f src/fortran/xerbla.f \
-       src/fortran/dtosci.f src/fortran/bexec.f \
-       src/fortran/varfunptr.f src/fortran/getfun.f \
-       src/fortran/savlod.f src/fortran/error.f src/fortran/cvdm.f \
-       src/fortran/tradsl.f src/fortran/mkindx.f src/fortran/whatln.f \
-       src/fortran/errmgr.f src/fortran/defmat.f src/fortran/mklist.f \
-       src/fortran/sigbas.f src/fortran/indxg.f src/fortran/istrue.f \
-       src/fortran/inisci.f src/fortran/ptover.f \
-       src/fortran/getfunction.f src/fortran/stackp.f \
-       src/fortran/dbasin.f src/fortran/macro.f src/fortran/extlarg.f \
-       src/fortran/getstr.f src/fortran/cvwm.f \
-       src/fortran/storeglobal.f src/fortran/lst2vars.f \
-       src/fortran/basnms.f src/fortran/ptrback.f src/fortran/getch.f \
-       src/fortran/ftob.f src/fortran/seteol.f src/fortran/basin.f \
-       src/fortran/clause.f src/fortran/compcl.f src/fortran/expsum.f \
-       src/fortran/copyvar.f src/fortran/putid.f src/fortran/itosci.f \
-       src/fortran/stackr2d.f src/fortran/stacki2d.f \
-       src/fortran/stackc2i.f src/fortran/isinstring.f \
-       src/fortran/relocstack.f
-@USE_DYNAMIC_STACK_TRUE@am__objects_1 =  \
-@USE_DYNAMIC_STACK_TRUE@       libscicore_algo_la-scimem64.lo
-am__objects_2 = libscicore_algo_la-inffic.lo \
+am__objects_1 = libscicore_algo_la-inffic.lo \
        libscicore_algo_la-cs2st.lo libscicore_algo_la-tmpdir.lo \
        libscicore_algo_la-intmacr2tree.lo libscicore_algo_la-run.lo \
        libscicore_algo_la-InitScilab.lo libscicore_algo_la-getval.lo \
@@ -322,14 +245,14 @@ am__objects_2 = libscicore_algo_la-inffic.lo \
        libscicore_algo_la-sci_mem_alloc.lo \
        libscicore_algo_la-hashtable.lo \
        libscicore_algo_la-hashtable_itr.lo \
-       libscicore_algo_la-hashtable_utility.lo $(am__objects_1)
-am__objects_3 = libscicore_algo_la-hashtable_core.lo \
+       libscicore_algo_la-hashtable_utility.lo \
+       libscicore_algo_la-scimem64.lo
+am__objects_2 = libscicore_algo_la-hashtable_core.lo \
        libscicore_algo_la-namstr.lo \
        libscicore_algo_la-search_functions.lo \
        libscicore_algo_la-demangle.lo \
        libscicore_algo_la-backtrace_print.lo
-@USE_DYNAMIC_STACK_TRUE@am__objects_4 = relocstack.lo
-am__objects_5 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
+am__objects_3 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
        nextj.lo setgetmode.lo showstack.lo misops.lo setippty.lo \
        compil.lo funnam.lo cmdstr.lo hndlops.lo cmplxt.lo skpins.lo \
        folhp.lo cvname.lo funs.lo fact.lo typ2cod.lo prompt.lo \
@@ -344,9 +267,9 @@ am__objects_5 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
        basnms.lo ptrback.lo getch.lo ftob.lo seteol.lo basin.lo \
        clause.lo compcl.lo expsum.lo copyvar.lo putid.lo itosci.lo \
        stackr2d.lo stacki2d.lo stackc2i.lo isinstring.lo \
-       $(am__objects_4)
-am_libscicore_algo_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-       $(am__objects_5)
+       relocstack.lo
+am_libscicore_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+       $(am__objects_3)
 libscicore_algo_la_OBJECTS = $(am_libscicore_algo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -355,7 +278,7 @@ am__v_lt_1 =
 @MAINTAINER_MODE_FALSE@am_libscicore_algo_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libscicore_algo_la_rpath =
 libscicore_la_DEPENDENCIES = libscicore-algo.la
-am__objects_6 = libscicore_la-sci_stacksize.lo \
+am__objects_4 = libscicore_la-sci_stacksize.lo \
        libscicore_la-sci_resume.lo libscicore_la-sci_mtlb_mode.lo \
        libscicore_la-sci_banner.lo libscicore_la-sci_where.lo \
        libscicore_la-sci_errcatch.lo libscicore_la-sci_getos.lo \
@@ -385,13 +308,13 @@ am__objects_6 = libscicore_la-sci_stacksize.lo \
        libscicore_la-sci_getvariablesonstack.lo \
        libscicore_la-sci_readgateway.lo libscicore_la-sci_comp.lo \
        libscicore_la-sci_exit.lo
-am__objects_7 = sci_f_global.lo sci_f_mtlb_mode.lo sci_f_resume.lo \
+am__objects_5 = sci_f_global.lo sci_f_mtlb_mode.lo sci_f_resume.lo \
        sci_f_dispbpt.lo sci_f_intppty.lo sci_f_ieee.lo \
        sci_f_macrovar.lo sci_f_exists.lo sci_f_errcatch.lo \
        sci_f_argn.lo sci_f_setbpt.lo sci_f_clearglobal.lo \
        sci_f_delbpt.lo where.lo sci_f_iserror.lo sci_f_comp.lo \
        sci_f_isglobal.lo
-am_libscicore_la_OBJECTS = $(am__objects_6) $(am__objects_7)
+am_libscicore_la_OBJECTS = $(am__objects_4) $(am__objects_5)
 libscicore_la_OBJECTS = $(am_libscicore_la_OBJECTS)
 libscicore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
@@ -467,8 +390,7 @@ am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@)
 am__v_F77LD_0 = @echo "  F77LD   " $@;
 am__v_F77LD_1 = 
 SOURCES = $(libscicore_algo_la_SOURCES) $(libscicore_la_SOURCES)
-DIST_SOURCES = $(am__libscicore_algo_la_SOURCES_DIST) \
-       $(libscicore_la_SOURCES)
+DIST_SOURCES = $(libscicore_algo_la_SOURCES) $(libscicore_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -766,83 +688,192 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/tmpdir.c \
-       src/c/intmacr2tree.c src/c/run.c src/c/InitScilab.c \
-       src/c/getval.c src/c/md5.c src/c/inisci-c.c src/c/IsAScalar.c \
-       src/c/texmacs.c src/c/sciquit.c src/c/stack1.c \
-       src/c/realmain.c src/c/stack3.c src/c/str2sci.c \
-       src/c/getmodules.c src/c/setgetSCIpath.c src/c/getmemory.c \
-       src/c/Funtab.c src/c/csignal.c src/c/callinterf.c \
-       src/c/scimem.c src/c/banier.c src/c/isanan.c src/c/parse.c \
-       src/c/stack2.c src/c/xscion.c src/c/SetScilabEnvironment.c \
-       src/c/returnanan.c src/c/LoadFunctionsTab.c \
-       src/c/with_module.c src/c/loadversion.c src/c/version.c \
-       src/c/stackinfo.c src/c/scirun.c src/c/SCIHOME.c \
-       src/c/warningmode.c src/c/InitializeCore.c \
-       src/c/TerminateCore.c src/c/coretable.c src/c/returnProperty.c \
-       src/c/returnPropertyList.c src/c/scilabmode.c \
-       src/c/GetXmlFileEncoding.c src/c/islittleendian.c \
-       src/c/terme.c src/c/ifexpr.c src/c/expr.c \
-       src/c/getcommandlineargs.c src/c/syncexec.c \
-       src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
-       src/c/commandwords.c src/c/freeArrayOfString.c \
-       src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
-       src/c/callDynamicGateway.c src/c/gw_dynamic_generic.c \
-       src/c/dynamic_gateways.c src/c/readGateway.c \
-       src/c/comparehandles.c src/c/setPrecisionFPU.c \
-       src/c/LaunchScilabSignal.c src/c/getos.c src/c/mode_exec.c \
-       src/c/predef.c src/c/transposeMatrix.c \
-       src/c/recursionFunction.c src/c/typename.c \
-       src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
-       src/c/exitCodeValue.c src/c/getversion.c \
-       src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
-       src/c/storeCommand.c src/c/backtrace.c src/c/signal_mgmt.c \
-       src/c/suspendProcess.c src/c/setieee.c src/c/setlines.c \
-       src/c/setformat.c src/c/InitializePreferences.c \
-       src/c/sci_tools.c src/c/getmaxMALLOC.c src/c/sci_mem_alloc.c \
-       src/c/hashtable/hashtable.c src/c/hashtable/hashtable_itr.c \
-       src/c/hashtable/hashtable_utility.c $(am__append_1)
+CORE_C_SOURCES = \
+src/c/inffic.c \
+src/c/cs2st.c \
+src/c/tmpdir.c \
+src/c/intmacr2tree.c \
+src/c/run.c \
+src/c/InitScilab.c \
+src/c/getval.c \
+src/c/md5.c \
+src/c/inisci-c.c \
+src/c/IsAScalar.c \
+src/c/texmacs.c \
+src/c/sciquit.c \
+src/c/stack1.c \
+src/c/realmain.c \
+src/c/stack3.c \
+src/c/str2sci.c \
+src/c/getmodules.c \
+src/c/setgetSCIpath.c \
+src/c/getmemory.c \
+src/c/Funtab.c \
+src/c/csignal.c \
+src/c/callinterf.c \
+src/c/scimem.c \
+src/c/banier.c \
+src/c/isanan.c \
+src/c/parse.c \
+src/c/stack2.c \
+src/c/xscion.c \
+src/c/SetScilabEnvironment.c \
+src/c/returnanan.c \
+src/c/LoadFunctionsTab.c \
+src/c/with_module.c \
+src/c/loadversion.c \
+src/c/version.c \
+src/c/stackinfo.c \
+src/c/scirun.c \
+src/c/SCIHOME.c \
+src/c/warningmode.c \
+src/c/InitializeCore.c \
+src/c/TerminateCore.c \
+src/c/coretable.c \
+src/c/returnProperty.c \
+src/c/returnPropertyList.c \
+src/c/scilabmode.c \
+src/c/GetXmlFileEncoding.c \
+src/c/islittleendian.c \
+src/c/terme.c \
+src/c/ifexpr.c \
+src/c/expr.c \
+src/c/getcommandlineargs.c \
+src/c/syncexec.c \
+src/c/callFunctionFromGateway.c \
+src/c/getvariablesname.c \
+src/c/commandwords.c \
+src/c/freeArrayOfString.c \
+src/c/getstaticdebuginfo.c \
+src/c/getdynamicdebuginfo.c \
+src/c/callDynamicGateway.c \
+src/c/gw_dynamic_generic.c \
+src/c/dynamic_gateways.c \
+src/c/readGateway.c \
+src/c/comparehandles.c \
+src/c/setPrecisionFPU.c \
+src/c/LaunchScilabSignal.c \
+src/c/getos.c \
+src/c/mode_exec.c \
+src/c/predef.c \
+src/c/transposeMatrix.c \
+src/c/recursionFunction.c \
+src/c/typename.c \
+src/c/inittypenames.c \
+src/c/funcprot.c \
+src/c/eqid.c \
+src/c/exitCodeValue.c \
+src/c/getversion.c \
+src/c/dynamic_tclsci.c \
+src/c/dynamic_parallel.c \
+src/c/storeCommand.c \
+src/c/backtrace.c \
+src/c/signal_mgmt.c \
+src/c/suspendProcess.c \
+src/c/setieee.c \
+src/c/setlines.c \
+src/c/setformat.c \
+src/c/InitializePreferences.c \
+src/c/sci_tools.c \
+src/c/getmaxMALLOC.c \
+src/c/sci_mem_alloc.c \
+src/c/hashtable/hashtable.c \
+src/c/hashtable/hashtable_itr.c \
+src/c/hashtable/hashtable_utility.c \
+src/c/scimem64.c
+
 CORE_CXX_SOURCES = src/cpp/hashtable_core.cpp \
 src/cpp/namstr.cpp \
 src/cpp/search_functions.cpp \
 src/cpp/demangle.cpp \
 src/cpp/backtrace_print.cpp
 
-CORE_FORTRAN_SOURCES = src/fortran/clunit.f src/fortran/getlin.f \
-       src/fortran/allowptr.f src/fortran/isany.f \
-       src/fortran/hmcreate.f src/fortran/nextj.f \
-       src/fortran/setgetmode.f src/fortran/showstack.f \
-       src/fortran/misops.f src/fortran/setippty.f \
-       src/fortran/compil.f src/fortran/funnam.f src/fortran/cmdstr.f \
-       src/fortran/hndlops.f src/fortran/cmplxt.f \
-       src/fortran/skpins.f src/fortran/folhp.f src/fortran/cvname.f \
-       src/fortran/funs.f src/fortran/fact.f src/fortran/typ2cod.f \
-       src/fortran/prompt.f src/fortran/intstr.f \
-       src/fortran/createref.f src/fortran/btof.f \
-       src/fortran/getnum.f src/fortran/btofm.f src/fortran/getsym.f \
-       src/fortran/findequal.f src/fortran/stackg.f \
-       src/fortran/find.f src/fortran/setlnb.f src/fortran/mrknmd.f \
-       src/fortran/stackgl.f src/fortran/allops.f src/fortran/mname.f \
-       src/fortran/command.f src/fortran/ref2val.f \
-       src/fortran/stack.f src/fortran/isbrk.f src/fortran/xerbla.f \
-       src/fortran/dtosci.f src/fortran/bexec.f \
-       src/fortran/varfunptr.f src/fortran/getfun.f \
-       src/fortran/savlod.f src/fortran/error.f src/fortran/cvdm.f \
-       src/fortran/tradsl.f src/fortran/mkindx.f src/fortran/whatln.f \
-       src/fortran/errmgr.f src/fortran/defmat.f src/fortran/mklist.f \
-       src/fortran/sigbas.f src/fortran/indxg.f src/fortran/istrue.f \
-       src/fortran/inisci.f src/fortran/ptover.f \
-       src/fortran/getfunction.f src/fortran/stackp.f \
-       src/fortran/dbasin.f src/fortran/macro.f src/fortran/extlarg.f \
-       src/fortran/getstr.f src/fortran/cvwm.f \
-       src/fortran/storeglobal.f src/fortran/lst2vars.f \
-       src/fortran/basnms.f src/fortran/ptrback.f src/fortran/getch.f \
-       src/fortran/ftob.f src/fortran/seteol.f src/fortran/basin.f \
-       src/fortran/clause.f src/fortran/compcl.f src/fortran/expsum.f \
-       src/fortran/copyvar.f src/fortran/putid.f src/fortran/itosci.f \
-       src/fortran/stackr2d.f src/fortran/stacki2d.f \
-       src/fortran/stackc2i.f src/fortran/isinstring.f \
-       $(am__append_2)
+CORE_FORTRAN_SOURCES = src/fortran/clunit.f \
+src/fortran/getlin.f \
+src/fortran/allowptr.f \
+src/fortran/isany.f \
+src/fortran/hmcreate.f \
+src/fortran/nextj.f \
+src/fortran/setgetmode.f \
+src/fortran/showstack.f \
+src/fortran/misops.f \
+src/fortran/setippty.f \
+src/fortran/compil.f \
+src/fortran/funnam.f \
+src/fortran/cmdstr.f \
+src/fortran/hndlops.f \
+src/fortran/cmplxt.f \
+src/fortran/skpins.f \
+src/fortran/folhp.f \
+src/fortran/cvname.f \
+src/fortran/funs.f \
+src/fortran/fact.f \
+src/fortran/typ2cod.f \
+src/fortran/prompt.f \
+src/fortran/intstr.f \
+src/fortran/createref.f \
+src/fortran/btof.f \
+src/fortran/getnum.f \
+src/fortran/btofm.f \
+src/fortran/getsym.f \
+src/fortran/findequal.f \
+src/fortran/stackg.f \
+src/fortran/find.f \
+src/fortran/setlnb.f \
+src/fortran/mrknmd.f \
+src/fortran/stackgl.f \
+src/fortran/allops.f \
+src/fortran/mname.f \
+src/fortran/command.f \
+src/fortran/ref2val.f \
+src/fortran/stack.f \
+src/fortran/isbrk.f \
+src/fortran/xerbla.f \
+src/fortran/dtosci.f \
+src/fortran/bexec.f \
+src/fortran/varfunptr.f \
+src/fortran/getfun.f \
+src/fortran/savlod.f \
+src/fortran/error.f \
+src/fortran/cvdm.f \
+src/fortran/tradsl.f \
+src/fortran/mkindx.f \
+src/fortran/whatln.f \
+src/fortran/errmgr.f \
+src/fortran/defmat.f \
+src/fortran/mklist.f \
+src/fortran/sigbas.f \
+src/fortran/indxg.f \
+src/fortran/istrue.f \
+src/fortran/inisci.f \
+src/fortran/ptover.f \
+src/fortran/getfunction.f \
+src/fortran/stackp.f \
+src/fortran/dbasin.f \
+src/fortran/macro.f \
+src/fortran/extlarg.f \
+src/fortran/getstr.f \
+src/fortran/cvwm.f \
+src/fortran/storeglobal.f \
+src/fortran/lst2vars.f \
+src/fortran/basnms.f \
+src/fortran/ptrback.f \
+src/fortran/getch.f \
+src/fortran/ftob.f \
+src/fortran/seteol.f \
+src/fortran/basin.f \
+src/fortran/clause.f \
+src/fortran/compcl.f \
+src/fortran/expsum.f \
+src/fortran/copyvar.f \
+src/fortran/putid.f \
+src/fortran/itosci.f \
+src/fortran/stackr2d.f \
+src/fortran/stacki2d.f \
+src/fortran/stackc2i.f \
+src/fortran/isinstring.f \
+src/fortran/relocstack.f
+
 GATEWAY_C_SOURCES = sci_gateway/c/sci_stacksize.c \
 sci_gateway/c/sci_resume.c \
 sci_gateway/c/sci_mtlb_mode.c \
@@ -937,7 +968,7 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/preferences/includes/ \
        -I$(top_srcdir)/modules/external_objects/includes/ \
        -I$(top_srcdir)/modules/functions/includes/ $(XML_FLAGS) \
-       $(AM_CPPFLAGS) $(am__append_3)
+       $(AM_CPPFLAGS) $(am__append_1)
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicore.la
 @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicore-algo.la libscicore.la
 @MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicore-algo.la
@@ -1035,7 +1066,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_4)
+TARGETS_ALL = $(am__append_2)
 
 ################ MACROS ######################
 # Rule to build a macro
index dd46080..b11401b 100644 (file)
 /* If it is UMFPACK/Suitesparse or UMFPACK standalone */
 #undef UMFPACK_SUITESPARSE
 
-/* If we are building a 64 bits version */
-#undef USE_DYNAMIC_STACK
-
 /* Version number of package */
 #undef VERSION
 
index e04414e..8fbaf8b 100644 (file)
@@ -66,7 +66,7 @@
  */
 typedef struct
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     double *Stk;
 #else
     double Stk[vsiz];
similarity index 90%
rename from scilab/modules/core/includes/stack.h.in
rename to scilab/modules/core/includes/stack.h
index e568d81..398262f 100644 (file)
@@ -37,7 +37,6 @@ C     ---------------------------------------------------------------
       integer intersiz
       parameter (intersiz=1024)
 c
-#ifdef USE_DYNAMIC_STACK
       integer, pointer :: stack_reserved_for_c__
       double precision, pointer, dimension(:) ::  stk
       integer,          pointer, dimension(:) :: istk
@@ -46,21 +45,6 @@ c
       complex*16,       pointer, dimension(:) :: zstk
       common /stack/ stack_reserved_for_c__, stk,
      $  istk, sstk, cstk, zstk
-#else
-      double precision stk(vsiz)
-      common /stack/ stk
-      integer istk(2*vsiz)
-      equivalence (istk(1),stk(1))
-
-      real sstk(2*vsiz)
-      equivalence (sstk(1),stk(1))
-       
-      character cstk*(4*vsiz)
-      equivalence (cstk,stk(1))
-
-      complex*16 zstk(vsiz/2)
-      equivalence (zstk(1),stk(1))
-#endif
 
       integer bot,top,idstk(nsiz,isizt),lstk(isizt),leps,bbot,bot0,isiz
       integer gbot,gtop,infstk(isizt)
index 7534149..b1aa8ae 100644 (file)
@@ -24,7 +24,7 @@
 #define LONG_MAX 2147483647L
 #endif
 
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
 #ifndef MAXLONG32
 #define MAXLONG32 2147483647L
 #endif
@@ -87,7 +87,7 @@ unsigned long GetLargestFreeMemoryRegion(void)
 #else
 unsigned long GetLargestFreeMemoryRegion(void)
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     /* we need to limit values to 32 bits for Scilab :( */
     return MAXLONG32;
 #else
@@ -123,7 +123,7 @@ unsigned long GetLargestFreeMemoryRegion(void)
     }
 
     return largestSize;
-#endif /* #ifdef USE_DYNAMIC_STACK */
+#endif /* #ifdef _MSC_VER (was: USE_DYNAMIC_STACK) */
 }
 #endif
 /*-----------------------------------------------------------------------------------*/
index c276242..490aa8f 100644 (file)
 #include "localization.h"
 #include "BOOL.h"
 /*--------------------------------------------------------------------------*/
-#ifdef USE_DYNAMIC_STACK
 extern int scimem64(int *n, int newsize, BOOL isglobal);
 extern void freemem64(BOOL isglobal);
-#else
-static char *the_p = NULL;
-static char *the_ps = NULL;
-static char *the_gp = NULL;
-static char *the_gps = NULL;
-#endif
 /*--------------------------------------------------------------------------*/
 int C2F(scimem) (int *newsize, int *ptr)
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     return scimem64(ptr, *newsize, FALSE);
 #else
     register char *p1 = NULL;
@@ -68,7 +61,7 @@ int C2F(scimem) (int *newsize, int *ptr)
 /*--------------------------------------------------------------------------*/
 int C2F(scigmem) (int *n, int *ptr)
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     return scimem64(ptr, *n, TRUE);
 #else
     register char *p1 = NULL;
@@ -102,7 +95,7 @@ int C2F(scigmem) (int *n, int *ptr)
 /*--------------------------------------------------------------------------*/
 void C2F(freeglobalstacklastmemory) (void)
 {
-#ifndef USE_DYNAMIC_STACK
+#ifdef _MSC_VER
     if (the_gps != NULL)
     {
         SCISTACKFREE(the_gps);
@@ -114,7 +107,7 @@ void C2F(freeglobalstacklastmemory) (void)
 /*--------------------------------------------------------------------------*/
 void C2F(freestacklastmemory) (void)
 {
-#ifndef USE_DYNAMIC_STACK
+#ifdef _MSC_VER
     if (the_ps != NULL)
     {
         SCISTACKFREE(the_ps);
@@ -126,7 +119,7 @@ void C2F(freestacklastmemory) (void)
 /*--------------------------------------------------------------------------*/
 void freeGlobalStackCurrentMemory()
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     freemem64(TRUE);
 #else
     if (the_gp != NULL)
@@ -139,7 +132,7 @@ void freeGlobalStackCurrentMemory()
 
 void freeStackCurrentMemory()
 {
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
     freemem64(FALSE);
 #else
     if (the_p != NULL)
index 8fe70a2..c9cf132 100644 (file)
@@ -45,7 +45,7 @@
 
 /* MAXLONG on 64 bits platform is not 2147483647 but 9223372036854775807 */
 /* For scilab's stack size, we need to limit to 2147483647 */
-#ifdef USE_DYNAMIC_STACK
+#ifndef _MSC_VER
 #ifndef MAXLONG32
 #define MAXLONG32 2147483647L
 #endif
@@ -57,14 +57,14 @@ int C2F(getstackinfo)(int *total, int *used)
 {
     *used = C2F(vstk).lstk[C2F(vstk).isiz - 1] - C2F(vstk).lstk[Bot - 1] + 1;
     *total = C2F(vstk).lstk[C2F(vstk).isiz - 1] - C2F(vstk).lstk[0];
-    return(0);
+    return (0);
 }
 /*--------------------------------------------------------------------------*/
 int C2F(getgstackinfo)(int *total, int *used)
 {
     *used = C2F(vstk).lstk[C2F(vstk).gtop] - C2F(vstk).lstk[C2F(vstk).isiz + 1] + 1;
     *total = C2F(vstk).lstk[C2F(vstk).gbot - 1] - C2F(vstk).lstk[C2F(vstk).isiz + 1] ;
-    return(0);
+    return (0);
 }
 /*--------------------------------------------------------------------------*/
 int C2F(getvariablesinfo)(int *total, int *used)
@@ -88,7 +88,7 @@ int getIntermediateMemoryNeeded(void)
 /*--------------------------------------------------------------------------*/
 BOOL is_a_valid_size_for_scilab_stack(int sizestack)
 {
-#if (defined(_MSC_VER) && defined(_WIN64)) || defined (USE_DYNAMIC_STACK)
+#if (defined(_MSC_VER) && defined(_WIN64)) || !defined (_MSC_VER)
     /* On x64 with scilab's stack , we need to limit stack access */
     if ((unsigned long)sizestack >= get_max_memory_for_scilab_stack() + 1)
     {
@@ -108,7 +108,7 @@ BOOL is_a_valid_size_for_scilab_stack(int sizestack)
 /*--------------------------------------------------------------------------*/
 unsigned long get_max_memory_for_scilab_stack(void)
 {
-#if (defined(_MSC_VER) && defined(_WIN64)) || defined (USE_DYNAMIC_STACK)
+#if (defined(_MSC_VER) && defined(_WIN64)) || !defined (_MSC_VER)
     return MAXLONG32 / sizeof(double);
 #else
     return MAXLONG / sizeof(double);
index af2755f..3e03994 100644 (file)
@@ -937,9 +937,9 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
+@JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \