r46361 - in /packages/scilab/branches/5.5/debian: changelog control patches/dynamic-stack.diff patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri Nov 8 08:44:35 UTC 2013
Author: sylvestre
Date: Fri Nov 8 08:44:35 2013
New Revision: 46361
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46361
Log:
* Force the Scilab dynamic stack for all archs
* Come back on gcc 4.8
Added:
packages/scilab/branches/5.5/debian/patches/dynamic-stack.diff
Modified:
packages/scilab/branches/5.5/debian/changelog
packages/scilab/branches/5.5/debian/control
packages/scilab/branches/5.5/debian/patches/series
packages/scilab/branches/5.5/debian/rules
Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46361&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog (original)
+++ packages/scilab/branches/5.5/debian/changelog Fri Nov 8 08:44:35 2013
@@ -1,3 +1,10 @@
+scilab (5.5.0~beta-1-1~exp4) experimental; urgency=low
+
+ * Force the Scilab dynamic stack for all archs
+ * Come back on gcc 4.8
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 07 Nov 2013 17:22:25 +0100
+
scilab (5.5.0~beta-1-1~exp3) experimental; urgency=low
* Only use gcc 4.7
Modified: packages/scilab/branches/5.5/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/control?rev=46361&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/control (original)
+++ packages/scilab/branches/5.5/debian/control Fri Nov 8 08:44:35 2013
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: autoconf, automake, cdbs, debhelper (>= 7),
- gfortran-4.7, g++-4.7, gcc-4.7,
+Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, libcurl4-openssl-dev,
gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0),
Added: packages/scilab/branches/5.5/debian/patches/dynamic-stack.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/dynamic-stack.diff?rev=46361&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/dynamic-stack.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/dynamic-stack.diff Fri Nov 8 08:44:35 2013
@@ -0,0 +1,2064 @@
+commit e27d835067b0264761ee3be86ecfc6a7eac2c4a3
+Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
+Date: Sat Oct 26 15:45:02 2013 +0200
+
+ * Force the usage of the dynamic stack on all !Windows
+ Otherwise, it breaks all platforms not using the dynamic stack and gcc 4.8
+
+ Change-Id: I54bc9ee2f9b2d77ef131738ee5b940f861cb7e77
+
+Index: scilab-5.5.0-beta-1/configure
+===================================================================
+--- scilab-5.5.0-beta-1.orig/configure 2013-11-07 17:17:54.000000000 +0100
++++ scilab-5.5.0-beta-1/configure 2013-11-07 17:20:34.000000000 +0100
+@@ -831,8 +831,6 @@
+ 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
+@@ -4100,6 +4098,65 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ # Make sure it works both with $CC and with simple cc.
++ # Following AC_PROG_CC_C_O, we do the test twice because some
++ # compilers refuse to overwrite an existing .o file with -o,
++ # though they will create one.
++ am_cv_prog_cc_c_o=yes
++ for am_i in 1 2; do
++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } \
++ && test -f conftest2.$ac_objext; then
++ : OK
++ else
++ am_cv_prog_cc_c_o=no
++ break
++ fi
++ done
++ rm -f core conftest*
++ unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar lib "link -lib"
+@@ -4208,7 +4265,13 @@
+ if ${am_cv_ar_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_ar_interface=ar
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ int some_variable = 0;
+@@ -4239,6 +4302,11 @@
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+@@ -5435,7 +5503,7 @@
+
+
+
+-am__api_version='1.13'
++am__api_version='1.14'
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+@@ -5957,7 +6025,48 @@
+ fi
+
+
+- # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
++
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make that assumption in our Makefile
++# recipes. So use an aggressive probe to check that the usage we want is
++# actually supported "in the wild" to an acceptable degree.
++# See automake bug#10828.
++# To make any issue more visible, cause the running configure to be aborted
++# by default if the 'rm' program in use doesn't match our expectations; the
++# user can still override this though.
++if rm -f && rm -fr && rm -rf; then : OK; else
++ cat >&2 <<'END'
++Oops!
++
++Your 'rm' program seems unable to run without file operands specified
++on the command line, even when the '-f' option is present. This is contrary
++to the behaviour of most rm programs out there, and not conforming with
++the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake at gnu.org about your system, including the value
++of your $PATH and any error possibly output before this message. This
++can help us improve future automake versions.
++
++END
++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
++ echo 'Configuration will proceed anyway, since you have set the' >&2
++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
++ echo >&2
++ else
++ cat >&2 <<'END'
++Aborting the configuration process, to ensure you take notice of the issue.
++
++You can download and install GNU coreutils to get an 'rm' implementation
++that behaves properly: <http://www.gnu.org/software/coreutils/>.
++
++If you want to complete the configuration process using your problematic
++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
++to "yes", and re-run configure.
++
++END
++ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
++ fi
++fi # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
+
+
+
+@@ -7773,6 +7882,65 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ # Make sure it works both with $CC and with simple cc.
++ # Following AC_PROG_CC_C_O, we do the test twice because some
++ # compilers refuse to overwrite an existing .o file with -o,
++ # though they will create one.
++ am_cv_prog_cc_c_o=yes
++ for am_i in 1 2; do
++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } \
++ && test -f conftest2.$ac_objext; then
++ : OK
++ else
++ am_cv_prog_cc_c_o=no
++ break
++ fi
++ done
++ rm -f core conftest*
++ unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
+ if test -z "$CC"; then
+ as_fn_error $? "You asked me to use gcc but i haven't been able to find it" "$LINENO" 5
+ fi
+@@ -8126,6 +8294,65 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ # Make sure it works both with $CC and with simple cc.
++ # Following AC_PROG_CC_C_O, we do the test twice because some
++ # compilers refuse to overwrite an existing .o file with -o,
++ # though they will create one.
++ am_cv_prog_cc_c_o=yes
++ for am_i in 1 2; do
++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } \
++ && test -f conftest2.$ac_objext; then
++ : OK
++ else
++ am_cv_prog_cc_c_o=no
++ break
++ fi
++ done
++ rm -f core conftest*
++ unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
+ if test -z "$CC"; then
+ as_fn_error $? "You asked me to use icc (intel C compiler) but I haven't been able to find it" "$LINENO" 5
+ fi
+@@ -8672,6 +8899,65 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ # Make sure it works both with $CC and with simple cc.
++ # Following AC_PROG_CC_C_O, we do the test twice because some
++ # compilers refuse to overwrite an existing .o file with -o,
++ # though they will create one.
++ am_cv_prog_cc_c_o=yes
++ for am_i in 1 2; do
++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } \
++ && test -f conftest2.$ac_objext; then
++ : OK
++ else
++ am_cv_prog_cc_c_o=no
++ break
++ fi
++ done
++ rm -f core conftest*
++ unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
+ fi
+
+ if test -z "$CC"; then
+@@ -9184,131 +9470,6 @@
+
+ # for "subdir-objects"
+
+-if test "x$CC" != xcc; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+-fi
+-set dummy $CC; ac_cc=`$as_echo "$2" |
+- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-# Make sure it works both with $CC and with simple cc.
+-# We do the test twice because some compilers refuse to overwrite an
+-# existing .o file with -o, though they will create one.
+-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-rm -f conftest2.*
+-if { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } &&
+- test -f conftest2.$ac_objext && { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; };
+-then
+- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+- if test "x$CC" != xcc; then
+- # Test first that cc exists at all.
+- if { ac_try='cc -c conftest.$ac_ext >&5'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+- rm -f conftest2.*
+- if { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } &&
+- test -f conftest2.$ac_objext && { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; };
+- then
+- # cc works too.
+- :
+- else
+- # cc exists but doesn't like -o.
+- eval ac_cv_prog_cc_${ac_cc}_c_o=no
+- fi
+- fi
+- fi
+-else
+- eval ac_cv_prog_cc_${ac_cc}_c_o=no
+-fi
+-rm -f core conftest*
+-
+-fi
+-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+-
+-fi
+-
+-# FIXME: we rely on the cache variable name because
+-# there is no other way.
+-set dummy $CC
+-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+-if test "$am_t" != yes; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-
+
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+@@ -9918,9 +10079,6 @@
+ 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
+@@ -9931,14 +10089,6 @@
+ 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
+@@ -10891,7 +11041,7 @@
+ $as_echo_n "checking to see if the java compiler works... " >&6; }
+
+ cat << \EOF > conftest.java
+-// #line 10894 "configure"
++// #line 11044 "configure"
+ import java.util.regex.Pattern;
+
+
+@@ -10978,7 +11128,7 @@
+ if test "x$ac_java_jvm_name" = "x" ; then
+
+ cat << \EOF > conftest.java
+-// #line 10981 "configure"
++// #line 11131 "configure"
+ import java.util.regex.Pattern;
+
+ import gnu.java.io.EncodingManager;
+@@ -11062,7 +11212,7 @@
+ # The class java.nio.charset.Charset is new to 1.4
+
+ cat << \EOF > conftest.java
+-// #line 11065 "configure"
++// #line 11215 "configure"
+ import java.util.regex.Pattern;
+
+ import java.nio.charset.Charset;
+@@ -11127,7 +11277,7 @@
+ # The class java.lang.StringBuilder is new to 1.5
+
+ cat << \EOF > conftest.java
+-// #line 11130 "configure"
++// #line 11280 "configure"
+ import java.util.regex.Pattern;
+
+ import java.lang.StringBuilder;
+@@ -11192,7 +11342,7 @@
+ # The class java.util.ArrayDeque is new to 1.6
+
+ cat << \EOF > conftest.java
+-// #line 11195 "configure"
++// #line 11345 "configure"
+ import java.util.regex.Pattern;
+
+ import java.util.ArrayDeque;
+@@ -11257,7 +11407,7 @@
+ # The class java.nio.file.Path is new to 1.7
+
+ cat << \EOF > conftest.java
+-// #line 11260 "configure"
++// #line 11410 "configure"
+ import java.util.regex.Pattern;
+
+ import java.nio.file.Path;
+@@ -12635,7 +12785,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 12638 "configure"
++// #line 12788 "configure"
+ import java.util.regex.Pattern;
+
+ import com.mxgraph.model.mxCell;
+@@ -12742,7 +12892,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 12745 "configure"
++// #line 12895 "configure"
+ import java.util.regex.Pattern;
+
+ import com.mxgraph.view.mxGraph;
+@@ -12814,7 +12964,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 12817 "configure"
++// #line 12967 "configure"
+ import java.util.regex.Pattern;
+
+ import com.mxgraph.view.mxGraph;
+@@ -12908,7 +13058,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 12911 "configure"
++// #line 13061 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.scirenderer.PackageInfo;
+@@ -13015,7 +13165,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 13018 "configure"
++// #line 13168 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.scirenderer.PackageInfo;
+@@ -13087,7 +13237,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 13090 "configure"
++// #line 13240 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.scirenderer.PackageInfo;
+@@ -13186,7 +13336,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13189 "configure"
++// #line 13339 "configure"
+ import java.util.regex.Pattern;
+
+ import org.flexdock.docking.DockingManager;
+@@ -13293,7 +13443,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 13296 "configure"
++// #line 13446 "configure"
+ import java.util.regex.Pattern;
+
+ import org.flexdock.util.Utilities;
+@@ -13365,7 +13515,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 13368 "configure"
++// #line 13518 "configure"
+ import java.util.regex.Pattern;
+
+ import org.flexdock.util.Utilities;
+@@ -13456,7 +13606,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13459 "configure"
++// #line 13609 "configure"
+ import java.util.regex.Pattern;
+
+ import com.jgoodies.looks.common.MenuItemRenderer;
+@@ -13573,7 +13723,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13576 "configure"
++// #line 13726 "configure"
+ import java.util.regex.Pattern;
+
+ import com.jgoodies.looks.common.MenuItemRenderer;
+@@ -13691,7 +13841,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13694 "configure"
++// #line 13844 "configure"
+ import java.util.regex.Pattern;
+
+ import com.l2fprod.util.AccessUtils;
+@@ -13808,7 +13958,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13811 "configure"
++// #line 13961 "configure"
+ import java.util.regex.Pattern;
+
+ import javax.media.opengl.glu.GLUnurbs;
+@@ -14031,7 +14181,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14034 "configure"
++// #line 14184 "configure"
+ import java.util.regex.Pattern;
+
+ import jogamp.common.os.MachineDescriptionRuntime;
+@@ -14205,7 +14355,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14208 "configure"
++// #line 14358 "configure"
+ import java.util.regex.Pattern;
+
+ import javax.help.JHelp;
+@@ -14322,7 +14472,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14325 "configure"
++// #line 14475 "configure"
+ import java.util.regex.Pattern;
+
+ import javax.help.JHelp;
+@@ -14440,7 +14590,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14443 "configure"
++// #line 14593 "configure"
+ import java.util.regex.Pattern;
+
+ import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
+@@ -14555,7 +14705,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14558 "configure"
++// #line 14708 "configure"
+ import java.util.regex.Pattern;
+
+ import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
+@@ -14673,7 +14823,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14676 "configure"
++// #line 14826 "configure"
+ import java.util.regex.Pattern;
+
+ import com.artenum.rosetta.core.action.AbstractConsoleAction;
+@@ -14779,7 +14929,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 14782 "configure"
++// #line 14932 "configure"
+ import java.util.regex.Pattern;
+
+ import com.artenum.rosetta.util.ConfigurationBuilder;
+@@ -14851,7 +15001,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 14854 "configure"
++// #line 15004 "configure"
+ import java.util.regex.Pattern;
+
+ import com.artenum.rosetta.util.ConfigurationBuilder;
+@@ -14944,7 +15094,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 14947 "configure"
++// #line 15097 "configure"
+ import java.util.regex.Pattern;
+
+ import net.sourceforge.jeuclid.LayoutContext;
+@@ -15063,7 +15213,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15066 "configure"
++// #line 15216 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.fop.pdf.PDFInfo;
+@@ -15180,7 +15330,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15183 "configure"
++// #line 15333 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.batik.parser.Parser;
+@@ -15297,7 +15447,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15300 "configure"
++// #line 15450 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.batik.parser.Parser;
+@@ -15404,7 +15554,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 15407 "configure"
++// #line 15557 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.batik.Version;
+@@ -15476,7 +15626,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 15479 "configure"
++// #line 15629 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.batik.Version;
+@@ -15567,7 +15717,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15570 "configure"
++// #line 15720 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.commons.io.output.CountingOutputStream;
+@@ -15684,7 +15834,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15687 "configure"
++// #line 15837 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.xmlgraphics.util.Service;
+@@ -15801,7 +15951,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15804 "configure"
++// #line 15954 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.avalon.framework.configuration.ConfigurationException;
+@@ -15918,7 +16068,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 15921 "configure"
++// #line 16071 "configure"
+ import java.util.regex.Pattern;
+
+ import org.w3c.dom.svg.SVGDocument;
+@@ -16035,7 +16185,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16038 "configure"
++// #line 16188 "configure"
+ import java.util.regex.Pattern;
+
+ import org.w3c.dom.svg.SVGDocument;
+@@ -16156,7 +16306,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16159 "configure"
++// #line 16309 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.commons.logging.LogFactory;
+@@ -16273,7 +16423,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16276 "configure"
++// #line 16426 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.jlatexmath.TeXFormula;
+@@ -16380,7 +16530,7 @@
+ if test "x" == "x"; then
+
+ cat << \EOF > conftest.java
+-// #line 16383 "configure"
++// #line 16533 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.jlatexmath.TeXFormula;
+@@ -16452,7 +16602,7 @@
+ else
+
+ cat << \EOF > conftest.java
+-// #line 16455 "configure"
++// #line 16605 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.jlatexmath.TeXFormula;
+@@ -16543,7 +16693,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16546 "configure"
++// #line 16696 "configure"
+ import java.util.regex.Pattern;
+
+ import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
+@@ -16666,7 +16816,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16669 "configure"
++// #line 16819 "configure"
+ import java.util.regex.Pattern;
+
+ import com.puppycrawl.tools.checkstyle.CheckStyleTask;
+@@ -16783,7 +16933,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16786 "configure"
++// #line 16936 "configure"
+ import java.util.regex.Pattern;
+
+ import org.apache.commons.beanutils.Converter;
+@@ -16900,7 +17050,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 16903 "configure"
++// #line 17053 "configure"
+ import java.util.regex.Pattern;
+
+ import antlr.TokenStreamException;
+@@ -17017,7 +17167,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 17020 "configure"
++// #line 17170 "configure"
+ import java.util.regex.Pattern;
+
+ import org.junit.Assert;
+@@ -17134,7 +17284,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 17137 "configure"
++// #line 17287 "configure"
+ import java.util.regex.Pattern;
+
+ import net.sourceforge.cobertura.merge.Main;
+@@ -17251,7 +17401,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 17254 "configure"
++// #line 17404 "configure"
+ import java.util.regex.Pattern;
+
+ import org.objectweb.asm.Type;
+@@ -17367,7 +17517,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 17370 "configure"
++// #line 17520 "configure"
+ import java.util.regex.Pattern;
+
+ import org.objectweb.asm.Type;
+@@ -25897,7 +26047,7 @@
+ { $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 25900 "configure"
++#line 26050 "configure"
+ #include "confdefs.h"
+
+ #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
+@@ -26208,7 +26358,7 @@
+ $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
+
+ cat > conftest.$ac_ext <<EOF
+-#line 26211 "configure"
++#line 26361 "configure"
+ #include "confdefs.h"
+
+ #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
+@@ -26792,7 +26942,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26795 "configure"
++// #line 26945 "configure"
+ import java.util.regex.Pattern;
+
+ import net.sf.saxon.Version;
+@@ -26907,7 +27057,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26910 "configure"
++// #line 27060 "configure"
+ import java.util.regex.Pattern;
+
+ import net.sf.saxon.Version;
+@@ -27023,7 +27173,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27026 "configure"
++// #line 27176 "configure"
+ import java.util.regex.Pattern;
+
+ import com.icl.saxon.Loader;
+@@ -33450,7 +33600,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 33453 "configure"
++#line 33603 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -33556,7 +33706,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 33559 "configure"
++#line 33709 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -40129,16 +40279,6 @@
+ # 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
+@@ -40312,10 +40452,6 @@
+ 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
+@@ -41446,10 +41582,6 @@
+
+
+
+-CPP="$CPP"
+- GREP="$GREP"
+- stack_h_cpp_flags="$stack_h_cpp_flags"
+-
+
+ _ACEOF
+
+@@ -41556,7 +41688,6 @@
+ "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
+@@ -43326,10 +43457,6 @@
+ _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: scilab-5.5.0-beta-1/configure.ac
+===================================================================
+--- scilab-5.5.0-beta-1.orig/configure.ac 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/configure.ac 2013-11-07 17:20:10.000000000 +0100
+@@ -708,11 +708,9 @@
+ 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 @@
+ # 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: scilab-5.5.0-beta-1/modules/core/Makefile.am
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/Makefile.am 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/Makefile.am 2013-11-07 17:20:10.000000000 +0100
+@@ -99,7 +99,8 @@
+ 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/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/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: scilab-5.5.0-beta-1/modules/core/Makefile.in
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/Makefile.in 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/Makefile.in 2013-11-07 17:20:40.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.13.3 from Makefile.am.
++# Makefile.in generated by automake 1.14 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+@@ -105,17 +105,15 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at USE_DYNAMIC_STACK_TRUE@am__append_1 = src/c/scimem64.c
+- at USE_DYNAMIC_STACK_TRUE@am__append_2 = src/fortran/relocstack.f
+
+ # Used by sci_getdebuginfo:
+- at TCLTK_TRUE@am__append_3 = $(TCL_INC_PATH) \
++ at 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)
+- at NEED_JAVA_TRUE@am__append_4 = java
++ at 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 @@
+ "$(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
+- at USE_DYNAMIC_STACK_TRUE@am__objects_1 = \
+- at 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 @@
+ 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
+- at 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 @@
+ 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_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+@@ -355,7 +278,7 @@
+ @MAINTAINER_MODE_FALSE at am_libscicore_algo_la_rpath =
+ @MAINTAINER_MODE_TRUE at 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 @@
+ 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_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;; \
+@@ -764,83 +686,192 @@
+ 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 \
+@@ -935,7 +966,7 @@
+ -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 at pkglib_LTLIBRARIES = libscicore.la
+ @MAINTAINER_MODE_FALSE at noinst_LTLIBRARIES = libscicore-algo.la libscicore.la
+ @MAINTAINER_MODE_TRUE at noinst_LTLIBRARIES = libscicore-algo.la
+@@ -1033,7 +1064,7 @@
+ #### 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
+@@ -1337,14 +1368,14 @@
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+Index: scilab-5.5.0-beta-1/modules/core/includes/machine.h.in
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/includes/machine.h.in 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/includes/machine.h.in 2013-11-07 17:20:35.000000000 +0100
+@@ -440,9 +440,6 @@
+ */
+ #undef LT_OBJDIR
+
+-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+-#undef NO_MINUS_C_MINUS_O
+-
+ /* Define to 0 if your system does not have the O_LARGEFILE flag */
+ #undef O_LARGEFILE
+
+@@ -503,9 +500,6 @@
+ /* 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: scilab-5.5.0-beta-1/modules/core/includes/stack-def.h
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/includes/stack-def.h 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/includes/stack-def.h 2013-11-07 17:20:10.000000000 +0100
+@@ -66,7 +66,7 @@
+ */
+ typedef struct
+ {
+-#ifdef USE_DYNAMIC_STACK
++#ifndef _MSC_VER
+ double *Stk;
+ #else
+ double Stk[vsiz];
+Index: scilab-5.5.0-beta-1/modules/core/includes/stack.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ scilab-5.5.0-beta-1/modules/core/includes/stack.h 2013-11-07 17:20:10.000000000 +0100
+@@ -0,0 +1,83 @@
++c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
++c Copyright (C) INRIA
++c
++c This file must be used under the terms of the CeCILL.
++c This source file is licensed as described in the file COPYING, which
++c you should have received as part of this distribution. The terms
++c are also available at
++c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
++
++c*------------------------------------------------------------------
++c vsiz size of internal scilab stack
++c
++c bsiz size of internal chain buf
++c
++c isizt maximum number of scilab variables global and local
++c isiz maximum number of scilab local variables
++c psiz defines recursion size
++c lsiz dim. of vector containing the command line
++c nlgh length of variable names
++c csiz used for character coding
++c intersiz used in interfaces
++c*-------------------------------------------------------------------
++Cc (DLL Digital Visual Fortran)
++cDEC$ IF DEFINED (FORDLL)
++cDEC$ ATTRIBUTES DLLIMPORT:: /stack/, /vstk/, /recu/, /iop/
++cDEC$ ATTRIBUTES DLLIMPORT:: /errgst/, /com/, /adre/
++cDEC$ ATTRIBUTES DLLIMPORT:: /intersci/ ,/cha1/, /dbg/
++cDEC$ ENDIF
++C ---------------------------------------------------------------
++ integer csiz,bsiz,isizt,psiz,nsiz,lsiz
++ parameter (csiz=63,bsiz=4096,isizt=10000,psiz=4096,nsiz=6)
++ parameter (lsiz=65536)
++ integer nlgh,vsiz
++ parameter (nlgh=nsiz*4,vsiz=2)
++ integer maxdb,maxbpt
++ parameter (maxdb=100,maxbpt=1000)
++ integer intersiz
++ parameter (intersiz=1024)
++c
++ integer, pointer :: stack_reserved_for_c__
++ double precision, pointer, dimension(:) :: stk
++ integer, pointer, dimension(:) :: istk
++ real, pointer, dimension(:) :: sstk
++ character, pointer :: cstk*(4*vsiz)
++ complex*16, pointer, dimension(:) :: zstk
++ common /stack/ stack_reserved_for_c__, stk,
++ $ istk, sstk, cstk, zstk
++
++ integer bot,top,idstk(nsiz,isizt),lstk(isizt),leps,bbot,bot0,isiz
++ integer gbot,gtop,infstk(isizt)
++ common /vstk/ bot,top,idstk,lstk,leps,bbot,bot0,infstk,
++ $ gbot,gtop,isiz
++
++ integer ids(nsiz,psiz),pstk(psiz),rstk(psiz),pt,niv,macr,paus
++ integer icall,krec
++ common /recu/ ids,pstk,rstk,pt,niv,macr,paus,icall,krec
++
++ integer ddt,err,lct(8),lin(lsiz),lpt(6),rio,rte,wte
++ common /iop/ ddt,err,lct,lin,lpt,rio,rte,wte
++
++ integer err1,err2,errct,toperr,errpt,ieee,catch
++ common /errgst/ err1,err2,errct,toperr,errpt,ieee,catch
++
++ integer sym,syn(nsiz),char1,fin,fun,lhs,rhs,ran(2),comp(3)
++ common /com/ sym,syn,char1,fin,fun,lhs,rhs,ran,comp
++
++ character alfa(csiz)*1,alfb(csiz)*1,buf*(bsiz)
++ common /cha1/ alfa,alfb,buf
++
++ integer wmac,lcntr,nmacs,macnms(nsiz,maxdb),lgptrs(maxdb+1)
++ integer bptlg(maxbpt)
++ common /dbg/ wmac,lcntr,nmacs,macnms,lgptrs,bptlg
++
++ integer lbot,ie,is,ipal,nbarg,ladr(intersiz)
++ common/adre/lbot,ie,is,ipal,nbarg,ladr
++ integer nbvars,iwhere(intersiz),
++ $ nbrows(intersiz),nbcols(intersiz),
++ $ itflag(intersiz),ntypes(intersiz),lad(intersiz),
++ $ ladc(intersiz),lhsvar(intersiz)
++ common/intersci/nbvars,iwhere,nbrows,nbcols,
++ $ itflag,ntypes,lad,ladc,lhsvar
++c*------------------------------------------------------------------
++
+Index: scilab-5.5.0-beta-1/modules/core/includes/stack.h.in
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/includes/stack.h.in 2013-11-07 17:20:10.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,99 +0,0 @@
+-c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+-c Copyright (C) INRIA
+-c
+-c This file must be used under the terms of the CeCILL.
+-c This source file is licensed as described in the file COPYING, which
+-c you should have received as part of this distribution. The terms
+-c are also available at
+-c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+-
+-c*------------------------------------------------------------------
+-c vsiz size of internal scilab stack
+-c
+-c bsiz size of internal chain buf
+-c
+-c isizt maximum number of scilab variables global and local
+-c isiz maximum number of scilab local variables
+-c psiz defines recursion size
+-c lsiz dim. of vector containing the command line
+-c nlgh length of variable names
+-c csiz used for character coding
+-c intersiz used in interfaces
+-c*-------------------------------------------------------------------
+-Cc (DLL Digital Visual Fortran)
+-cDEC$ IF DEFINED (FORDLL)
+-cDEC$ ATTRIBUTES DLLIMPORT:: /stack/, /vstk/, /recu/, /iop/
+-cDEC$ ATTRIBUTES DLLIMPORT:: /errgst/, /com/, /adre/
+-cDEC$ ATTRIBUTES DLLIMPORT:: /intersci/ ,/cha1/, /dbg/
+-cDEC$ ENDIF
+-C ---------------------------------------------------------------
+- integer csiz,bsiz,isizt,psiz,nsiz,lsiz
+- parameter (csiz=63,bsiz=4096,isizt=10000,psiz=4096,nsiz=6)
+- parameter (lsiz=65536)
+- integer nlgh,vsiz
+- parameter (nlgh=nsiz*4,vsiz=2)
+- integer maxdb,maxbpt
+- parameter (maxdb=100,maxbpt=1000)
+- 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
+- real, pointer, dimension(:) :: sstk
+- character, pointer :: cstk*(4*vsiz)
+- 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)
+- common /vstk/ bot,top,idstk,lstk,leps,bbot,bot0,infstk,
+- $ gbot,gtop,isiz
+-
+- integer ids(nsiz,psiz),pstk(psiz),rstk(psiz),pt,niv,macr,paus
+- integer icall,krec
+- common /recu/ ids,pstk,rstk,pt,niv,macr,paus,icall,krec
+-
+- integer ddt,err,lct(8),lin(lsiz),lpt(6),rio,rte,wte
+- common /iop/ ddt,err,lct,lin,lpt,rio,rte,wte
+-
+- integer err1,err2,errct,toperr,errpt,ieee,catch
+- common /errgst/ err1,err2,errct,toperr,errpt,ieee,catch
+-
+- integer sym,syn(nsiz),char1,fin,fun,lhs,rhs,ran(2),comp(3)
+- common /com/ sym,syn,char1,fin,fun,lhs,rhs,ran,comp
+-
+- character alfa(csiz)*1,alfb(csiz)*1,buf*(bsiz)
+- common /cha1/ alfa,alfb,buf
+-
+- integer wmac,lcntr,nmacs,macnms(nsiz,maxdb),lgptrs(maxdb+1)
+- integer bptlg(maxbpt)
+- common /dbg/ wmac,lcntr,nmacs,macnms,lgptrs,bptlg
+-
+- integer lbot,ie,is,ipal,nbarg,ladr(intersiz)
+- common/adre/lbot,ie,is,ipal,nbarg,ladr
+- integer nbvars,iwhere(intersiz),
+- $ nbrows(intersiz),nbcols(intersiz),
+- $ itflag(intersiz),ntypes(intersiz),lad(intersiz),
+- $ ladc(intersiz),lhsvar(intersiz)
+- common/intersci/nbvars,iwhere,nbrows,nbcols,
+- $ itflag,ntypes,lad,ladc,lhsvar
+-c*------------------------------------------------------------------
+-
+Index: scilab-5.5.0-beta-1/modules/core/src/c/getmaxMALLOC.c
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/src/c/getmaxMALLOC.c 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/src/c/getmaxMALLOC.c 2013-11-07 17:20:10.000000000 +0100
+@@ -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 @@
+ #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 @@
+ }
+
+ return largestSize;
+-#endif /* #ifdef USE_DYNAMIC_STACK */
++#endif /* #ifdef _MSC_VER (was: USE_DYNAMIC_STACK) */
+ }
+ #endif
+ /*-----------------------------------------------------------------------------------*/
+Index: scilab-5.5.0-beta-1/modules/core/src/c/scimem.c
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/src/c/scimem.c 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/src/c/scimem.c 2013-11-07 17:20:10.000000000 +0100
+@@ -17,19 +17,12 @@
+ #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(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 @@
+ /*--------------------------------------------------------------------------*/
+ void C2F(freeglobalstacklastmemory) (void)
+ {
+-#ifndef USE_DYNAMIC_STACK
++#ifdef _MSC_VER
+ if (the_gps != NULL)
+ {
+ SCISTACKFREE(the_gps);
+@@ -114,7 +107,7 @@
+ /*--------------------------------------------------------------------------*/
+ void C2F(freestacklastmemory) (void)
+ {
+-#ifndef USE_DYNAMIC_STACK
++#ifdef _MSC_VER
+ if (the_ps != NULL)
+ {
+ SCISTACKFREE(the_ps);
+@@ -126,7 +119,7 @@
+ /*--------------------------------------------------------------------------*/
+ void freeGlobalStackCurrentMemory()
+ {
+-#ifdef USE_DYNAMIC_STACK
++#ifndef _MSC_VER
+ freemem64(TRUE);
+ #else
+ if (the_gp != NULL)
+@@ -139,7 +132,7 @@
+
+ void freeStackCurrentMemory()
+ {
+-#ifdef USE_DYNAMIC_STACK
++#ifndef _MSC_VER
+ freemem64(FALSE);
+ #else
+ if (the_p != NULL)
+Index: scilab-5.5.0-beta-1/modules/core/src/c/stackinfo.c
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/core/src/c/stackinfo.c 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/core/src/c/stackinfo.c 2013-11-07 17:20:10.000000000 +0100
+@@ -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 @@
+ {
+ *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 @@
+ /*--------------------------------------------------------------------------*/
+ 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 @@
+ /*--------------------------------------------------------------------------*/
+ 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: scilab-5.5.0-beta-1/modules/javasci/Makefile.in
+===================================================================
+--- scilab-5.5.0-beta-1.orig/modules/javasci/Makefile.in 2013-11-07 17:20:10.000000000 +0100
++++ scilab-5.5.0-beta-1/modules/javasci/Makefile.in 2013-11-07 17:20:50.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.13.3 from Makefile.am.
++# Makefile.in generated by automake 1.14 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+@@ -724,14 +724,14 @@
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46361&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series (original)
+++ packages/scilab/branches/5.5/debian/patches/series Fri Nov 8 08:44:35 2013
@@ -2,3 +2,4 @@
librarypath.diff
missingaddchapter.diff
disable-static-libstdc.patch
+dynamic-stack.diff
Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46361&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules (original)
+++ packages/scilab/branches/5.5/debian/rules Fri Nov 8 08:44:35 2013
@@ -18,8 +18,7 @@
--with-umfpack --enable-build-localization \
--with-install-help-xml --enable-build-help \
--with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH) \
- --enable-mpi --disable-static-system-lib \
- F77=gfortran-4.7 CC=gcc-4.7 CXX=g++-4.7
+ --enable-mpi --disable-static-system-lib
# --enable-compilation-tests
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
More information about the debian-science-commits
mailing list