diff options
153 files changed, 1797 insertions, 1509 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X index c46bb27..538382d 100644 --- a/scilab/CHANGES_5.2.X +++ b/scilab/CHANGES_5.2.X | |||
@@ -46,6 +46,7 @@ Xcos: | |||
46 | - Java package (eg namespace) has been added to reduce the number of classes | 46 | - Java package (eg namespace) has been added to reduce the number of classes |
47 | per package and improve readability. | 47 | per package and improve readability. |
48 | - org.scilab.modules.graph is independent from Xcos and can be safely used. | 48 | - org.scilab.modules.graph is independent from Xcos and can be safely used. |
49 | - the actions are now only instanciated per graph. | ||
49 | 50 | ||
50 | * bug 4206 fixed - The CreateMask action didn't generate a valid submatrix. | 51 | * bug 4206 fixed - The CreateMask action didn't generate a valid submatrix. |
51 | 52 | ||
@@ -134,9 +135,15 @@ Compilation: | |||
134 | 135 | ||
135 | * Better detection of JOGL | 136 | * Better detection of JOGL |
136 | 137 | ||
138 | * Better check of the lib math (libm) | ||
139 | |||
137 | * When two versions of the same jar libraries, in some cases, the system | 140 | * When two versions of the same jar libraries, in some cases, the system |
138 | could not detect any of them | 141 | could not detect any of them |
139 | 142 | ||
143 | * bug 5496 fixed - When the option --disable-build-help was enabled, the | ||
144 | check/use of jeuclid was disabled. It was causing build | ||
145 | issue since jeuclid is now necessary for graphics. | ||
146 | |||
140 | * bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when | 147 | * bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when |
141 | looking for Java libraries (Fedora 12 for example) | 148 | looking for Java libraries (Fedora 12 for example) |
142 | 149 | ||
@@ -258,6 +265,8 @@ Bug fixes: | |||
258 | 265 | ||
259 | * bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path. | 266 | * bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path. |
260 | 267 | ||
268 | * bug 6558 fixed - Infinite value was not plotted even if it was possible. | ||
269 | |||
261 | 270 | ||
262 | Changes between version 5.2.0-beta1 and 5.2.0 of Scilab | 271 | Changes between version 5.2.0-beta1 and 5.2.0 of Scilab |
263 | ========================================================== | 272 | ========================================================== |
@@ -2027,3 +2036,6 @@ Bug fixes: | |||
2027 | * bug 6468 fixed - wrong check in dnaupd. | 2036 | * bug 6468 fixed - wrong check in dnaupd. |
2028 | 2037 | ||
2029 | * bug 6495 fixed - in lqr, variable Q not defined. | 2038 | * bug 6495 fixed - in lqr, variable Q not defined. |
2039 | |||
2040 | * bug 4785 fixed - tand(0) generated an error | ||
2041 | |||
diff --git a/scilab/Makefile.in b/scilab/Makefile.in index f9caeaf..5556290 100644 --- a/scilab/Makefile.in +++ b/scilab/Makefile.in | |||
@@ -415,6 +415,7 @@ LD = @LD@ | |||
415 | LDFLAGS = @LDFLAGS@ | 415 | LDFLAGS = @LDFLAGS@ |
416 | LIBICONV = @LIBICONV@ | 416 | LIBICONV = @LIBICONV@ |
417 | LIBINTL = @LIBINTL@ | 417 | LIBINTL = @LIBINTL@ |
418 | LIBM = @LIBM@ | ||
418 | LIBOBJS = @LIBOBJS@ | 419 | LIBOBJS = @LIBOBJS@ |
419 | LIBS = @LIBS@ | 420 | LIBS = @LIBS@ |
420 | LIBTOOL = @LIBTOOL@ | 421 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/configure b/scilab/configure index 88eb0f7..c7a88c1 100755 --- a/scilab/configure +++ b/scilab/configure | |||
@@ -639,7 +639,6 @@ AVALON_FRAMEWORK | |||
639 | XML_APIS_EXT | 639 | XML_APIS_EXT |
640 | XMLGRAPHICS_COMMONS | 640 | XMLGRAPHICS_COMMONS |
641 | COMMONS_IO | 641 | COMMONS_IO |
642 | JEUCLID_CORE | ||
643 | FOP | 642 | FOP |
644 | SAXON | 643 | SAXON |
645 | BATIK | 644 | BATIK |
@@ -719,6 +718,7 @@ MSGFMT | |||
719 | GETTEXT_MACRO_VERSION | 718 | GETTEXT_MACRO_VERSION |
720 | USE_NLS | 719 | USE_NLS |
721 | POW_LIB | 720 | POW_LIB |
721 | LIBM | ||
722 | GUI_ENABLE | 722 | GUI_ENABLE |
723 | GIWS_FALSE | 723 | GIWS_FALSE |
724 | GIWS_TRUE | 724 | GIWS_TRUE |
@@ -740,16 +740,13 @@ JAVA_DEBUG_OPTIONS | |||
740 | JAVA_HOME | 740 | JAVA_HOME |
741 | JAVA_JNI_LIBS | 741 | JAVA_JNI_LIBS |
742 | JAVA_JNI_INCLUDE | 742 | JAVA_JNI_INCLUDE |
743 | JUNIT | ||
744 | BSH | ||
745 | QDOX | ||
746 | TESTNG | ||
747 | ANTLR | 743 | ANTLR |
748 | COMMONS_BEANUTILS | 744 | COMMONS_BEANUTILS |
749 | CHECKSTYLE | 745 | CHECKSTYLE |
750 | JLATEXMATH | 746 | JLATEXMATH |
751 | COMMONS_LOGGING | 747 | COMMONS_LOGGING |
752 | JHDF5 | 748 | JHDF5 |
749 | JEUCLID_CORE | ||
753 | JROSETTA_ENGINE | 750 | JROSETTA_ENGINE |
754 | JROSETTA_API | 751 | JROSETTA_API |
755 | JHALL | 752 | JHALL |
@@ -9843,7 +9840,7 @@ $as_echo "$ac_java_classpath" >&6; } | |||
9843 | $as_echo_n "checking to see if the java compiler works... " >&6; } | 9840 | $as_echo_n "checking to see if the java compiler works... " >&6; } |
9844 | 9841 | ||
9845 | cat << \EOF > conftest.java | 9842 | cat << \EOF > conftest.java |
9846 | // #line 9846 "configure" | 9843 | // #line 9843 "configure" |
9847 | 9844 | ||
9848 | 9845 | ||
9849 | public class conftest { | 9846 | public class conftest { |
@@ -9903,7 +9900,7 @@ $as_echo_n "checking type of jvm... " >&6; } | |||
9903 | if test "x$ac_java_jvm_name" = "x" ; then | 9900 | if test "x$ac_java_jvm_name" = "x" ; then |
9904 | 9901 | ||
9905 | cat << \EOF > conftest.java | 9902 | cat << \EOF > conftest.java |
9906 | // #line 9906 "configure" | 9903 | // #line 9903 "configure" |
9907 | import gnu.java.io.EncodingManager; | 9904 | import gnu.java.io.EncodingManager; |
9908 | 9905 | ||
9909 | public class conftest { | 9906 | public class conftest { |
@@ -9961,7 +9958,7 @@ $as_echo_n "checking java API version... " >&6; } | |||
9961 | 9958 | ||
9962 | 9959 | ||
9963 | cat << \EOF > conftest.java | 9960 | cat << \EOF > conftest.java |
9964 | // #line 9964 "configure" | 9961 | // #line 9961 "configure" |
9965 | import java.nio.charset.Charset; | 9962 | import java.nio.charset.Charset; |
9966 | 9963 | ||
9967 | public class conftest { | 9964 | public class conftest { |
@@ -10000,7 +9997,7 @@ EOF | |||
10000 | 9997 | ||
10001 | 9998 | ||
10002 | cat << \EOF > conftest.java | 9999 | cat << \EOF > conftest.java |
10003 | // #line 10003 "configure" | 10000 | // #line 10000 "configure" |
10004 | import java.lang.StringBuilder; | 10001 | import java.lang.StringBuilder; |
10005 | 10002 | ||
10006 | public class conftest { | 10003 | public class conftest { |
@@ -11250,7 +11247,7 @@ $as_echo_n "checking jgraphx... " >&6; } | |||
11250 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11247 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11251 | 11248 | ||
11252 | cat << \EOF > conftest.java | 11249 | cat << \EOF > conftest.java |
11253 | // #line 11253 "configure" | 11250 | // #line 11250 "configure" |
11254 | import com.mxgraph.model.mxCell; | 11251 | import com.mxgraph.model.mxCell; |
11255 | 11252 | ||
11256 | public class conftest { | 11253 | public class conftest { |
@@ -11337,7 +11334,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; } | |||
11337 | export ac_java_classpath="$JGRAPHX:$ac_java_classpath" | 11334 | export ac_java_classpath="$JGRAPHX:$ac_java_classpath" |
11338 | 11335 | ||
11339 | cat << \EOF > conftest.java | 11336 | cat << \EOF > conftest.java |
11340 | // #line 11340 "configure" | 11337 | // #line 11337 "configure" |
11341 | import com.mxgraph.view.mxGraph; | 11338 | import com.mxgraph.view.mxGraph; |
11342 | 11339 | ||
11343 | public class conftest { | 11340 | public class conftest { |
@@ -11401,7 +11398,7 @@ $as_echo_n "checking flexdock... " >&6; } | |||
11401 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11398 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11402 | 11399 | ||
11403 | cat << \EOF > conftest.java | 11400 | cat << \EOF > conftest.java |
11404 | // #line 11404 "configure" | 11401 | // #line 11401 "configure" |
11405 | import org.flexdock.docking.DockingManager; | 11402 | import org.flexdock.docking.DockingManager; |
11406 | 11403 | ||
11407 | public class conftest { | 11404 | public class conftest { |
@@ -11502,7 +11499,7 @@ $as_echo_n "checking looks... " >&6; } | |||
11502 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11499 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11503 | 11500 | ||
11504 | cat << \EOF > conftest.java | 11501 | cat << \EOF > conftest.java |
11505 | // #line 11505 "configure" | 11502 | // #line 11502 "configure" |
11506 | import com.jgoodies.looks.common.RenderingUtils; | 11503 | import com.jgoodies.looks.common.RenderingUtils; |
11507 | 11504 | ||
11508 | public class conftest { | 11505 | public class conftest { |
@@ -11603,7 +11600,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; } | |||
11603 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11600 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11604 | 11601 | ||
11605 | cat << \EOF > conftest.java | 11602 | cat << \EOF > conftest.java |
11606 | // #line 11606 "configure" | 11603 | // #line 11603 "configure" |
11607 | import com.jgoodies.looks.common.RenderingUtils; | 11604 | import com.jgoodies.looks.common.RenderingUtils; |
11608 | 11605 | ||
11609 | public class conftest { | 11606 | public class conftest { |
@@ -11705,7 +11702,7 @@ $as_echo_n "checking skinlf... " >&6; } | |||
11705 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11702 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11706 | 11703 | ||
11707 | cat << \EOF > conftest.java | 11704 | cat << \EOF > conftest.java |
11708 | // #line 11708 "configure" | 11705 | // #line 11705 "configure" |
11709 | import com.l2fprod.util.AccessUtils; | 11706 | import com.l2fprod.util.AccessUtils; |
11710 | 11707 | ||
11711 | public class conftest { | 11708 | public class conftest { |
@@ -11806,7 +11803,7 @@ $as_echo_n "checking jogl... " >&6; } | |||
11806 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 11803 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
11807 | 11804 | ||
11808 | cat << \EOF > conftest.java | 11805 | cat << \EOF > conftest.java |
11809 | // #line 11809 "configure" | 11806 | // #line 11806 "configure" |
11810 | import javax.media.opengl.glu.GLUnurbs; | 11807 | import javax.media.opengl.glu.GLUnurbs; |
11811 | 11808 | ||
11812 | public class conftest { | 11809 | public class conftest { |
@@ -12007,7 +12004,7 @@ $as_echo_n "checking gluegen-rt... " >&6; } | |||
12007 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12004 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12008 | 12005 | ||
12009 | cat << \EOF > conftest.java | 12006 | cat << \EOF > conftest.java |
12010 | // #line 12010 "configure" | 12007 | // #line 12007 "configure" |
12011 | import com.sun.gluegen.runtime.CPU; | 12008 | import com.sun.gluegen.runtime.CPU; |
12012 | 12009 | ||
12013 | public class conftest { | 12010 | public class conftest { |
@@ -12163,7 +12160,7 @@ $as_echo_n "checking jhall... " >&6; } | |||
12163 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12160 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12164 | 12161 | ||
12165 | cat << \EOF > conftest.java | 12162 | cat << \EOF > conftest.java |
12166 | // #line 12166 "configure" | 12163 | // #line 12163 "configure" |
12167 | import javax.help.JHelp; | 12164 | import javax.help.JHelp; |
12168 | 12165 | ||
12169 | public class conftest { | 12166 | public class conftest { |
@@ -12264,7 +12261,7 @@ $as_echo_n "checking javahelp2... " >&6; } | |||
12264 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12261 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12265 | 12262 | ||
12266 | cat << \EOF > conftest.java | 12263 | cat << \EOF > conftest.java |
12267 | // #line 12267 "configure" | 12264 | // #line 12264 "configure" |
12268 | import javax.help.JHelp; | 12265 | import javax.help.JHelp; |
12269 | 12266 | ||
12270 | public class conftest { | 12267 | public class conftest { |
@@ -12366,7 +12363,7 @@ $as_echo_n "checking jrosetta-API... " >&6; } | |||
12366 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12363 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12367 | 12364 | ||
12368 | cat << \EOF > conftest.java | 12365 | cat << \EOF > conftest.java |
12369 | // #line 12369 "configure" | 12366 | // #line 12366 "configure" |
12370 | import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; | 12367 | import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; |
12371 | 12368 | ||
12372 | public class conftest { | 12369 | public class conftest { |
@@ -12467,7 +12464,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; } | |||
12467 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12464 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12468 | 12465 | ||
12469 | cat << \EOF > conftest.java | 12466 | cat << \EOF > conftest.java |
12470 | // #line 12470 "configure" | 12467 | // #line 12467 "configure" |
12471 | import com.artenum.rosetta.core.action.AbstractConsoleAction; | 12468 | import com.artenum.rosetta.core.action.AbstractConsoleAction; |
12472 | 12469 | ||
12473 | public class conftest { | 12470 | public class conftest { |
@@ -12547,17 +12544,18 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e | |||
12547 | JROSETTA_ENGINE=$PACKAGE_JAR_FILE | 12544 | JROSETTA_ENGINE=$PACKAGE_JAR_FILE |
12548 | 12545 | ||
12549 | 12546 | ||
12550 | if test $HDF5_ENABLE = yes; then | ||
12551 | # HDF5 java lib | ||
12552 | 12547 | ||
12553 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5 | 12548 | # MathML rendering solution |
12554 | $as_echo_n "checking jhdf5... " >&6; } | 12549 | # Used in both graphic & help |
12550 | |||
12551 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5 | ||
12552 | $as_echo_n "checking jeuclid-core... " >&6; } | ||
12555 | PACKAGE_JAR_FILE= | 12553 | PACKAGE_JAR_FILE= |
12556 | found_jar=no | 12554 | found_jar=no |
12557 | saved_ac_java_classpath=$ac_java_classpath | 12555 | saved_ac_java_classpath=$ac_java_classpath |
12558 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 12556 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
12559 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 12557 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
12560 | for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do | 12558 | for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do |
12561 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 12559 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
12562 | # echo "protected $jar" | 12560 | # echo "protected $jar" |
12563 | # jar_resolved=`ls $jar 2>/dev/null` | 12561 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -12569,8 +12567,8 @@ $as_echo_n "checking jhdf5... " >&6; } | |||
12569 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12567 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12570 | 12568 | ||
12571 | cat << \EOF > conftest.java | 12569 | cat << \EOF > conftest.java |
12572 | // #line 12572 "configure" | 12570 | // #line 12570 "configure" |
12573 | import ncsa.hdf.hdf5lib.HDF5Constants; | 12571 | import net.sourceforge.jeuclid.LayoutContext; |
12574 | 12572 | ||
12575 | public class conftest { | 12573 | public class conftest { |
12576 | public static void main(String[] argv) { | 12574 | public static void main(String[] argv) { |
@@ -12639,27 +12637,28 @@ $as_echo "$jar_resolved" >&6; } | |||
12639 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12637 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
12640 | $as_echo "no" >&6; } | 12638 | $as_echo "no" >&6; } |
12641 | if test "" = "yes"; then | 12639 | if test "" = "yes"; then |
12642 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5 | 12640 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5 |
12643 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;} | 12641 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;} |
12644 | else | 12642 | else |
12645 | as_fn_error "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5 | 12643 | as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5 |
12646 | fi | 12644 | fi |
12647 | fi | 12645 | fi |
12648 | 12646 | ||
12649 | JHDF5=$PACKAGE_JAR_FILE | 12647 | JEUCLID_CORE=$PACKAGE_JAR_FILE |
12650 | 12648 | ||
12651 | fi | ||
12652 | 12649 | ||
12653 | # Logging (flexdock dep) | ||
12654 | 12650 | ||
12655 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5 | 12651 | if test $HDF5_ENABLE = yes; then |
12656 | $as_echo_n "checking commons-logging... " >&6; } | 12652 | # HDF5 java lib |
12653 | |||
12654 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5 | ||
12655 | $as_echo_n "checking jhdf5... " >&6; } | ||
12657 | PACKAGE_JAR_FILE= | 12656 | PACKAGE_JAR_FILE= |
12658 | found_jar=no | 12657 | found_jar=no |
12659 | saved_ac_java_classpath=$ac_java_classpath | 12658 | saved_ac_java_classpath=$ac_java_classpath |
12660 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 12659 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
12661 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 12660 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
12662 | for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do | 12661 | for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do |
12663 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 12662 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
12664 | # echo "protected $jar" | 12663 | # echo "protected $jar" |
12665 | # jar_resolved=`ls $jar 2>/dev/null` | 12664 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -12671,8 +12670,8 @@ $as_echo_n "checking commons-logging... " >&6; } | |||
12671 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12670 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
12672 | 12671 | ||
12673 | cat << \EOF > conftest.java | 12672 | cat << \EOF > conftest.java |
12674 | // #line 12674 "configure" | 12673 | // #line 12673 "configure" |
12675 | import org.apache.commons.logging.LogFactory; | 12674 | import ncsa.hdf.hdf5lib.HDF5Constants; |
12676 | 12675 | ||
12677 | public class conftest { | 12676 | public class conftest { |
12678 | public static void main(String[] argv) { | 12677 | public static void main(String[] argv) { |
@@ -12741,26 +12740,27 @@ $as_echo "$jar_resolved" >&6; } | |||
12741 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12740 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
12742 | $as_echo "no" >&6; } | 12741 | $as_echo "no" >&6; } |
12743 | if test "" = "yes"; then | 12742 | if test "" = "yes"; then |
12744 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5 | 12743 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5 |
12745 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;} | 12744 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;} |
12746 | else | 12745 | else |
12747 | as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5 | 12746 | as_fn_error "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5 |
12748 | fi | 12747 | fi |
12749 | fi | 12748 | fi |
12750 | 12749 | ||
12751 | COMMONS_LOGGING=$PACKAGE_JAR_FILE | 12750 | JHDF5=$PACKAGE_JAR_FILE |
12752 | 12751 | ||
12752 | fi | ||
12753 | 12753 | ||
12754 | # JLaTeXMath | 12754 | # Logging (flexdock dep) |
12755 | 12755 | ||
12756 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5 | 12756 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5 |
12757 | $as_echo_n "checking jlatexmath... " >&6; } | 12757 | $as_echo_n "checking commons-logging... " >&6; } |
12758 | PACKAGE_JAR_FILE= | 12758 | PACKAGE_JAR_FILE= |
12759 | found_jar=no | 12759 | found_jar=no |
12760 | saved_ac_java_classpath=$ac_java_classpath | 12760 | saved_ac_java_classpath=$ac_java_classpath |
12761 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 12761 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
12762 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 12762 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
12763 | for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do | 12763 | for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do |
12764 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 12764 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
12765 | # echo "protected $jar" | 12765 | # echo "protected $jar" |
12766 | # jar_resolved=`ls $jar 2>/dev/null` | 12766 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -12773,7 +12773,7 @@ $as_echo_n "checking jlatexmath... " >&6; } | |||
12773 | 12773 | ||
12774 | cat << \EOF > conftest.java | 12774 | cat << \EOF > conftest.java |
12775 | // #line 12775 "configure" | 12775 | // #line 12775 "configure" |
12776 | import org.scilab.forge.jlatexmath.TeXFormula; | 12776 | import org.apache.commons.logging.LogFactory; |
12777 | 12777 | ||
12778 | public class conftest { | 12778 | public class conftest { |
12779 | public static void main(String[] argv) { | 12779 | public static void main(String[] argv) { |
@@ -12842,234 +12842,26 @@ $as_echo "$jar_resolved" >&6; } | |||
12842 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12842 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
12843 | $as_echo "no" >&6; } | 12843 | $as_echo "no" >&6; } |
12844 | if test "" = "yes"; then | 12844 | if test "" = "yes"; then |
12845 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&5 | 12845 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5 |
12846 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&2;} | 12846 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;} |
12847 | else | ||
12848 | as_fn_error "Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" "$LINENO" 5 | ||
12849 | fi | ||
12850 | fi | ||
12851 | |||
12852 | JLATEXMATH=$PACKAGE_JAR_FILE | ||
12853 | |||
12854 | |||
12855 | |||
12856 | $as_echo "#define WITH_GUI /**/" >>confdefs.h | ||
12857 | |||
12858 | |||
12859 | fi | ||
12860 | |||
12861 | # Checkstyle (code checking) | ||
12862 | |||
12863 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5 | ||
12864 | $as_echo_n "checking checkstyle... " >&6; } | ||
12865 | PACKAGE_JAR_FILE= | ||
12866 | found_jar=no | ||
12867 | saved_ac_java_classpath=$ac_java_classpath | ||
12868 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | ||
12869 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | ||
12870 | for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do | ||
12871 | # jar=`echo $jar|sed -e 's/ /\\ /'` | ||
12872 | # echo "protected $jar" | ||
12873 | # jar_resolved=`ls $jar 2>/dev/null` | ||
12874 | # echo "looking for $jar_resolved" | ||
12875 | # TODO check the behaviour when spaces | ||
12876 | jars_resolved=`ls $jar 2>/dev/null` | ||
12877 | for jar_resolved in $jars_resolved; do # If several jars matches | ||
12878 | if test -e "$jar_resolved"; then | ||
12879 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | ||
12880 | |||
12881 | cat << \EOF > conftest.java | ||
12882 | // #line 12882 "configure" | ||
12883 | import com.puppycrawl.tools.checkstyle.CheckStyleTask; | ||
12884 | |||
12885 | public class conftest { | ||
12886 | public static void main(String[] argv) { | ||
12887 | |||
12888 | } | ||
12889 | } | ||
12890 | EOF | ||
12891 | |||
12892 | CLASSPATH=$ac_java_classpath | ||
12893 | export CLASSPATH | ||
12894 | cmd="$JAVAC ${JAVAC_FLAGS} conftest.java" | ||
12895 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then | ||
12896 | if test ""no"" = "no"; then | ||
12897 | echo "yes" >&5 | ||
12898 | |||
12899 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
12900 | $as_echo "$jar_resolved" >&6; } | ||
12901 | found_jar=yes | ||
12902 | PACKAGE_JAR_FILE=$jar_resolved | ||
12903 | break | ||
12904 | |||
12905 | else | ||
12906 | cmd="$JAVA conftest" | ||
12907 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then | ||
12908 | echo "yes" >&5 | ||
12909 | |||
12910 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
12911 | $as_echo "$jar_resolved" >&6; } | ||
12912 | found_jar=yes | ||
12913 | PACKAGE_JAR_FILE=$jar_resolved | ||
12914 | break | ||
12915 | |||
12916 | else | ||
12917 | echo "configure: failed program was:" >&5 | ||
12918 | cat conftest.java >&5 | ||
12919 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
12920 | |||
12921 | ac_java_classpath=$saved_ac_java_classpath | ||
12922 | |||
12923 | |||
12924 | fi | ||
12925 | fi | ||
12926 | else | ||
12927 | echo "configure: failed program was:" >&5 | ||
12928 | cat conftest.java >&5 | ||
12929 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
12930 | |||
12931 | ac_java_classpath=$saved_ac_java_classpath | ||
12932 | |||
12933 | |||
12934 | fi | ||
12935 | |||
12936 | fi | ||
12937 | done | ||
12938 | # If ls returns several results and the first one is OK, stop the search | ||
12939 | if test "$found_jar" = "yes"; then | ||
12940 | break | ||
12941 | fi | ||
12942 | done | ||
12943 | # If found, no need to search in other directory | ||
12944 | if test "$found_jar" = "yes"; then | ||
12945 | break | ||
12946 | fi | ||
12947 | done | ||
12948 | if test "$found_jar" = "no"; then | ||
12949 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
12950 | $as_echo "no" >&6; } | ||
12951 | if test ""yes"" = "yes"; then | ||
12952 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5 | ||
12953 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;} | ||
12954 | else | ||
12955 | as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5 | ||
12956 | fi | ||
12957 | fi | ||
12958 | |||
12959 | CHECKSTYLE=$PACKAGE_JAR_FILE | ||
12960 | |||
12961 | |||
12962 | # Commons beanutils (dependency of checkstyle) | ||
12963 | |||
12964 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5 | ||
12965 | $as_echo_n "checking commons-beanutils... " >&6; } | ||
12966 | PACKAGE_JAR_FILE= | ||
12967 | found_jar=no | ||
12968 | saved_ac_java_classpath=$ac_java_classpath | ||
12969 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | ||
12970 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | ||
12971 | for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do | ||
12972 | # jar=`echo $jar|sed -e 's/ /\\ /'` | ||
12973 | # echo "protected $jar" | ||
12974 | # jar_resolved=`ls $jar 2>/dev/null` | ||
12975 | # echo "looking for $jar_resolved" | ||
12976 | # TODO check the behaviour when spaces | ||
12977 | jars_resolved=`ls $jar 2>/dev/null` | ||
12978 | for jar_resolved in $jars_resolved; do # If several jars matches | ||
12979 | if test -e "$jar_resolved"; then | ||
12980 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | ||
12981 | |||
12982 | cat << \EOF > conftest.java | ||
12983 | // #line 12983 "configure" | ||
12984 | import org.apache.commons.beanutils.Converter; | ||
12985 | |||
12986 | public class conftest { | ||
12987 | public static void main(String[] argv) { | ||
12988 | |||
12989 | } | ||
12990 | } | ||
12991 | EOF | ||
12992 | |||
12993 | CLASSPATH=$ac_java_classpath | ||
12994 | export CLASSPATH | ||
12995 | cmd="$JAVAC ${JAVAC_FLAGS} conftest.java" | ||
12996 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then | ||
12997 | if test ""no"" = "no"; then | ||
12998 | echo "yes" >&5 | ||
12999 | |||
13000 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
13001 | $as_echo "$jar_resolved" >&6; } | ||
13002 | found_jar=yes | ||
13003 | PACKAGE_JAR_FILE=$jar_resolved | ||
13004 | break | ||
13005 | |||
13006 | else | ||
13007 | cmd="$JAVA conftest" | ||
13008 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then | ||
13009 | echo "yes" >&5 | ||
13010 | |||
13011 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
13012 | $as_echo "$jar_resolved" >&6; } | ||
13013 | found_jar=yes | ||
13014 | PACKAGE_JAR_FILE=$jar_resolved | ||
13015 | break | ||
13016 | |||
13017 | else | ||
13018 | echo "configure: failed program was:" >&5 | ||
13019 | cat conftest.java >&5 | ||
13020 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
13021 | |||
13022 | ac_java_classpath=$saved_ac_java_classpath | ||
13023 | |||
13024 | |||
13025 | fi | ||
13026 | fi | ||
13027 | else | ||
13028 | echo "configure: failed program was:" >&5 | ||
13029 | cat conftest.java >&5 | ||
13030 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
13031 | |||
13032 | ac_java_classpath=$saved_ac_java_classpath | ||
13033 | |||
13034 | |||
13035 | fi | ||
13036 | |||
13037 | fi | ||
13038 | done | ||
13039 | # If ls returns several results and the first one is OK, stop the search | ||
13040 | if test "$found_jar" = "yes"; then | ||
13041 | break | ||
13042 | fi | ||
13043 | done | ||
13044 | # If found, no need to search in other directory | ||
13045 | if test "$found_jar" = "yes"; then | ||
13046 | break | ||
13047 | fi | ||
13048 | done | ||
13049 | if test "$found_jar" = "no"; then | ||
13050 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
13051 | $as_echo "no" >&6; } | ||
13052 | if test ""yes"" = "yes"; then | ||
13053 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5 | ||
13054 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;} | ||
13055 | else | 12847 | else |
13056 | as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5 | 12848 | as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5 |
13057 | fi | 12849 | fi |
13058 | fi | 12850 | fi |
13059 | 12851 | ||
13060 | COMMONS_BEANUTILS=$PACKAGE_JAR_FILE | 12852 | COMMONS_LOGGING=$PACKAGE_JAR_FILE |
13061 | 12853 | ||
13062 | 12854 | ||
13063 | # antlr (dependency of checkstyle) | 12855 | # JLaTeXMath |
13064 | 12856 | ||
13065 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5 | 12857 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5 |
13066 | $as_echo_n "checking antlr... " >&6; } | 12858 | $as_echo_n "checking jlatexmath... " >&6; } |
13067 | PACKAGE_JAR_FILE= | 12859 | PACKAGE_JAR_FILE= |
13068 | found_jar=no | 12860 | found_jar=no |
13069 | saved_ac_java_classpath=$ac_java_classpath | 12861 | saved_ac_java_classpath=$ac_java_classpath |
13070 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 12862 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
13071 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 12863 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
13072 | for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do | 12864 | for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do |
13073 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 12865 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
13074 | # echo "protected $jar" | 12866 | # echo "protected $jar" |
13075 | # jar_resolved=`ls $jar 2>/dev/null` | 12867 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -13081,8 +12873,8 @@ $as_echo_n "checking antlr... " >&6; } | |||
13081 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12873 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
13082 | 12874 | ||
13083 | cat << \EOF > conftest.java | 12875 | cat << \EOF > conftest.java |
13084 | // #line 13084 "configure" | 12876 | // #line 12876 "configure" |
13085 | import antlr.TokenStreamException; | 12877 | import org.scilab.forge.jlatexmath.TeXFormula; |
13086 | 12878 | ||
13087 | public class conftest { | 12879 | public class conftest { |
13088 | public static void main(String[] argv) { | 12880 | public static void main(String[] argv) { |
@@ -13150,128 +12942,33 @@ $as_echo "$jar_resolved" >&6; } | |||
13150 | if test "$found_jar" = "no"; then | 12942 | if test "$found_jar" = "no"; then |
13151 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12943 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
13152 | $as_echo "no" >&6; } | 12944 | $as_echo "no" >&6; } |
13153 | if test ""yes"" = "yes"; then | 12945 | if test "" = "yes"; then |
13154 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5 | 12946 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&5 |
13155 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;} | 12947 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&2;} |
13156 | else | 12948 | else |
13157 | as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5 | 12949 | as_fn_error "Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" "$LINENO" 5 |
13158 | fi | 12950 | fi |
13159 | fi | 12951 | fi |
13160 | 12952 | ||
13161 | ANTLR=$PACKAGE_JAR_FILE | 12953 | JLATEXMATH=$PACKAGE_JAR_FILE |
13162 | |||
13163 | |||
13164 | # Test NG (java unitary test) | ||
13165 | |||
13166 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5 | ||
13167 | $as_echo_n "checking testng... " >&6; } | ||
13168 | PACKAGE_JAR_FILE= | ||
13169 | found_jar=no | ||
13170 | saved_ac_java_classpath=$ac_java_classpath | ||
13171 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | ||
13172 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | ||
13173 | for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do | ||
13174 | # jar=`echo $jar|sed -e 's/ /\\ /'` | ||
13175 | # echo "protected $jar" | ||
13176 | # jar_resolved=`ls $jar 2>/dev/null` | ||
13177 | # echo "looking for $jar_resolved" | ||
13178 | # TODO check the behaviour when spaces | ||
13179 | jars_resolved=`ls $jar 2>/dev/null` | ||
13180 | for jar_resolved in $jars_resolved; do # If several jars matches | ||
13181 | if test -e "$jar_resolved"; then | ||
13182 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | ||
13183 | |||
13184 | cat << \EOF > conftest.java | ||
13185 | // #line 13185 "configure" | ||
13186 | import org.testng.TestNG; | ||
13187 | |||
13188 | public class conftest { | ||
13189 | public static void main(String[] argv) { | ||
13190 | |||
13191 | } | ||
13192 | } | ||
13193 | EOF | ||
13194 | |||
13195 | CLASSPATH=$ac_java_classpath | ||
13196 | export CLASSPATH | ||
13197 | cmd="$JAVAC ${JAVAC_FLAGS} conftest.java" | ||
13198 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then | ||
13199 | if test ""no"" = "no"; then | ||
13200 | echo "yes" >&5 | ||
13201 | |||
13202 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
13203 | $as_echo "$jar_resolved" >&6; } | ||
13204 | found_jar=yes | ||
13205 | PACKAGE_JAR_FILE=$jar_resolved | ||
13206 | break | ||
13207 | |||
13208 | else | ||
13209 | cmd="$JAVA conftest" | ||
13210 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then | ||
13211 | echo "yes" >&5 | ||
13212 | 12954 | ||
13213 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
13214 | $as_echo "$jar_resolved" >&6; } | ||
13215 | found_jar=yes | ||
13216 | PACKAGE_JAR_FILE=$jar_resolved | ||
13217 | break | ||
13218 | 12955 | ||
13219 | else | ||
13220 | echo "configure: failed program was:" >&5 | ||
13221 | cat conftest.java >&5 | ||
13222 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
13223 | 12956 | ||
13224 | ac_java_classpath=$saved_ac_java_classpath | 12957 | $as_echo "#define WITH_GUI /**/" >>confdefs.h |
13225 | 12958 | ||
13226 | 12959 | ||
13227 | fi | ||
13228 | fi | 12960 | fi |
13229 | else | ||
13230 | echo "configure: failed program was:" >&5 | ||
13231 | cat conftest.java >&5 | ||
13232 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
13233 | |||
13234 | ac_java_classpath=$saved_ac_java_classpath | ||
13235 | |||
13236 | |||
13237 | fi | ||
13238 | |||
13239 | fi | ||
13240 | done | ||
13241 | # If ls returns several results and the first one is OK, stop the search | ||
13242 | if test "$found_jar" = "yes"; then | ||
13243 | break | ||
13244 | fi | ||
13245 | done | ||
13246 | # If found, no need to search in other directory | ||
13247 | if test "$found_jar" = "yes"; then | ||
13248 | break | ||
13249 | fi | ||
13250 | done | ||
13251 | if test "$found_jar" = "no"; then | ||
13252 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
13253 | $as_echo "no" >&6; } | ||
13254 | if test ""yes"" = "yes"; then | ||
13255 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&5 | ||
13256 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&2;} | ||
13257 | else | ||
13258 | as_fn_error "Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" "$LINENO" 5 | ||
13259 | fi | ||
13260 | fi | ||
13261 | |||
13262 | TESTNG=$PACKAGE_JAR_FILE | ||
13263 | 12961 | ||
12962 | # Checkstyle (code checking) | ||
13264 | 12963 | ||
13265 | # Qdox (parses declarations and Javadoc) - dependency of TestNG | 12964 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5 |
13266 | 12965 | $as_echo_n "checking checkstyle... " >&6; } | |
13267 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5 | ||
13268 | $as_echo_n "checking qdox... " >&6; } | ||
13269 | PACKAGE_JAR_FILE= | 12966 | PACKAGE_JAR_FILE= |
13270 | found_jar=no | 12967 | found_jar=no |
13271 | saved_ac_java_classpath=$ac_java_classpath | 12968 | saved_ac_java_classpath=$ac_java_classpath |
13272 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 12969 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
13273 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 12970 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
13274 | for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do | 12971 | for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do |
13275 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 12972 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
13276 | # echo "protected $jar" | 12973 | # echo "protected $jar" |
13277 | # jar_resolved=`ls $jar 2>/dev/null` | 12974 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -13283,8 +12980,8 @@ $as_echo_n "checking qdox... " >&6; } | |||
13283 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 12980 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
13284 | 12981 | ||
13285 | cat << \EOF > conftest.java | 12982 | cat << \EOF > conftest.java |
13286 | // #line 13286 "configure" | 12983 | // #line 12983 "configure" |
13287 | import com.thoughtworks.qdox.tools.QDoxTester; | 12984 | import com.puppycrawl.tools.checkstyle.CheckStyleTask; |
13288 | 12985 | ||
13289 | public class conftest { | 12986 | public class conftest { |
13290 | public static void main(String[] argv) { | 12987 | public static void main(String[] argv) { |
@@ -13353,26 +13050,26 @@ $as_echo "$jar_resolved" >&6; } | |||
13353 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 13050 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
13354 | $as_echo "no" >&6; } | 13051 | $as_echo "no" >&6; } |
13355 | if test ""yes"" = "yes"; then | 13052 | if test ""yes"" = "yes"; then |
13356 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5 | 13053 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5 |
13357 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&2;} | 13054 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;} |
13358 | else | 13055 | else |
13359 | as_fn_error "Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" "$LINENO" 5 | 13056 | as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5 |
13360 | fi | 13057 | fi |
13361 | fi | 13058 | fi |
13362 | 13059 | ||
13363 | QDOX=$PACKAGE_JAR_FILE | 13060 | CHECKSTYLE=$PACKAGE_JAR_FILE |
13364 | 13061 | ||
13365 | 13062 | ||
13366 | # bsh (Java scripting environment) - dependency of TestNG | 13063 | # Commons beanutils (dependency of checkstyle) |
13367 | 13064 | ||
13368 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5 | 13065 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5 |
13369 | $as_echo_n "checking bsh... " >&6; } | 13066 | $as_echo_n "checking commons-beanutils... " >&6; } |
13370 | PACKAGE_JAR_FILE= | 13067 | PACKAGE_JAR_FILE= |
13371 | found_jar=no | 13068 | found_jar=no |
13372 | saved_ac_java_classpath=$ac_java_classpath | 13069 | saved_ac_java_classpath=$ac_java_classpath |
13373 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 13070 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
13374 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 13071 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
13375 | for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do | 13072 | for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do |
13376 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 13073 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
13377 | # echo "protected $jar" | 13074 | # echo "protected $jar" |
13378 | # jar_resolved=`ls $jar 2>/dev/null` | 13075 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -13384,8 +13081,8 @@ $as_echo_n "checking bsh... " >&6; } | |||
13384 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 13081 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
13385 | 13082 | ||
13386 | cat << \EOF > conftest.java | 13083 | cat << \EOF > conftest.java |
13387 | // #line 13387 "configure" | 13084 | // #line 13084 "configure" |
13388 | import bsh.Console; | 13085 | import org.apache.commons.beanutils.Converter; |
13389 | 13086 | ||
13390 | public class conftest { | 13087 | public class conftest { |
13391 | public static void main(String[] argv) { | 13088 | public static void main(String[] argv) { |
@@ -13454,26 +13151,26 @@ $as_echo "$jar_resolved" >&6; } | |||
13454 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 13151 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
13455 | $as_echo "no" >&6; } | 13152 | $as_echo "no" >&6; } |
13456 | if test ""yes"" = "yes"; then | 13153 | if test ""yes"" = "yes"; then |
13457 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&5 | 13154 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5 |
13458 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&2;} | 13155 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;} |
13459 | else | 13156 | else |
13460 | as_fn_error "Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" "$LINENO" 5 | 13157 | as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5 |
13461 | fi | 13158 | fi |
13462 | fi | 13159 | fi |
13463 | 13160 | ||
13464 | BSH=$PACKAGE_JAR_FILE | 13161 | COMMONS_BEANUTILS=$PACKAGE_JAR_FILE |
13465 | 13162 | ||
13466 | 13163 | ||
13467 | # Junit - dependency of TestNG | 13164 | # antlr (dependency of checkstyle) |
13468 | 13165 | ||
13469 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5 | 13166 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5 |
13470 | $as_echo_n "checking junit... " >&6; } | 13167 | $as_echo_n "checking antlr... " >&6; } |
13471 | PACKAGE_JAR_FILE= | 13168 | PACKAGE_JAR_FILE= |
13472 | found_jar=no | 13169 | found_jar=no |
13473 | saved_ac_java_classpath=$ac_java_classpath | 13170 | saved_ac_java_classpath=$ac_java_classpath |
13474 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | 13171 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" |
13475 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | 13172 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do |
13476 | for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do | 13173 | for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do |
13477 | # jar=`echo $jar|sed -e 's/ /\\ /'` | 13174 | # jar=`echo $jar|sed -e 's/ /\\ /'` |
13478 | # echo "protected $jar" | 13175 | # echo "protected $jar" |
13479 | # jar_resolved=`ls $jar 2>/dev/null` | 13176 | # jar_resolved=`ls $jar 2>/dev/null` |
@@ -13485,8 +13182,8 @@ $as_echo_n "checking junit... " >&6; } | |||
13485 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 13182 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
13486 | 13183 | ||
13487 | cat << \EOF > conftest.java | 13184 | cat << \EOF > conftest.java |
13488 | // #line 13488 "configure" | 13185 | // #line 13185 "configure" |
13489 | import junit.framework.Assert; | 13186 | import antlr.TokenStreamException; |
13490 | 13187 | ||
13491 | public class conftest { | 13188 | public class conftest { |
13492 | public static void main(String[] argv) { | 13189 | public static void main(String[] argv) { |
@@ -13555,15 +13252,14 @@ $as_echo "$jar_resolved" >&6; } | |||
13555 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 13252 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
13556 | $as_echo "no" >&6; } | 13253 | $as_echo "no" >&6; } |
13557 | if test ""yes"" = "yes"; then | 13254 | if test ""yes"" = "yes"; then |
13558 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&5 | 13255 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5 |
13559 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&2;} | 13256 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;} |
13560 | else | 13257 | else |
13561 | as_fn_error "Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" "$LINENO" 5 | 13258 | as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5 |
13562 | fi | 13259 | fi |
13563 | fi | 13260 | fi |
13564 | 13261 | ||
13565 | JUNIT=$PACKAGE_JAR_FILE | 13262 | ANTLR=$PACKAGE_JAR_FILE |
13566 | |||
13567 | 13263 | ||
13568 | 13264 | ||
13569 | else | 13265 | else |
@@ -14045,10 +13741,145 @@ fi | |||
14045 | done | 13741 | done |
14046 | 13742 | ||
14047 | 13743 | ||
13744 | |||
13745 | # Check of the libm (lib math). Macro provided by libtool. | ||
13746 | save_LDFLAGS="$LIBS" | ||
13747 | LIBM= | ||
13748 | case $host in | ||
13749 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) | ||
13750 | # These system don't have libm, or don't need it | ||
13751 | ;; | ||
13752 | *-ncr-sysv4.3*) | ||
13753 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 | ||
13754 | $as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } | ||
13755 | if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then : | ||
13756 | $as_echo_n "(cached) " >&6 | ||
13757 | else | ||
13758 | ac_check_lib_save_LIBS=$LIBS | ||
13759 | LIBS="-lmw $LIBS" | ||
13760 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13761 | /* end confdefs.h. */ | ||
13762 | |||
13763 | /* Override any GCC internal prototype to avoid an error. | ||
13764 | Use char because int might match the return type of a GCC | ||
13765 | builtin and then its argument prototype would still apply. */ | ||
13766 | #ifdef __cplusplus | ||
13767 | extern "C" | ||
13768 | #endif | ||
13769 | char _mwvalidcheckl (); | ||
13770 | int | ||
13771 | main () | ||
13772 | { | ||
13773 | return _mwvalidcheckl (); | ||
13774 | ; | ||
13775 | return 0; | ||
13776 | } | ||
13777 | _ACEOF | ||
13778 | if ac_fn_c_try_link "$LINENO"; then : | ||
13779 | ac_cv_lib_mw__mwvalidcheckl=yes | ||
13780 | else | ||
13781 | ac_cv_lib_mw__mwvalidcheckl=no | ||
13782 | fi | ||
13783 | rm -f core conftest.err conftest.$ac_objext \ | ||
13784 | conftest$ac_exeext conftest.$ac_ext | ||
13785 | LIBS=$ac_check_lib_save_LIBS | ||
13786 | fi | ||
13787 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 | ||
13788 | $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } | ||
13789 | if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then : | ||
13790 | LIBM="-lmw" | ||
13791 | fi | ||
13792 | |||
13793 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 | ||
13794 | $as_echo_n "checking for cos in -lm... " >&6; } | ||
13795 | if test "${ac_cv_lib_m_cos+set}" = set; then : | ||
13796 | $as_echo_n "(cached) " >&6 | ||
13797 | else | ||
13798 | ac_check_lib_save_LIBS=$LIBS | ||
13799 | LIBS="-lm $LIBS" | ||
13800 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13801 | /* end confdefs.h. */ | ||
13802 | |||
13803 | /* Override any GCC internal prototype to avoid an error. | ||
13804 | Use char because int might match the return type of a GCC | ||
13805 | builtin and then its argument prototype would still apply. */ | ||
13806 | #ifdef __cplusplus | ||
13807 | extern "C" | ||
13808 | #endif | ||
13809 | char cos (); | ||
13810 | int | ||
13811 | main () | ||
13812 | { | ||
13813 | return cos (); | ||
13814 | ; | ||
13815 | return 0; | ||
13816 | } | ||
13817 | _ACEOF | ||
13818 | if ac_fn_c_try_link "$LINENO"; then : | ||
13819 | ac_cv_lib_m_cos=yes | ||
13820 | else | ||
13821 | ac_cv_lib_m_cos=no | ||
13822 | fi | ||
13823 | rm -f core conftest.err conftest.$ac_objext \ | ||
13824 | conftest$ac_exeext conftest.$ac_ext | ||
13825 | LIBS=$ac_check_lib_save_LIBS | ||
13826 | fi | ||
13827 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 | ||
13828 | $as_echo "$ac_cv_lib_m_cos" >&6; } | ||
13829 | if test "x$ac_cv_lib_m_cos" = x""yes; then : | ||
13830 | LIBM="$LIBM -lm" | ||
13831 | fi | ||
13832 | |||
13833 | ;; | ||
13834 | *) | ||
13835 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 | ||
13836 | $as_echo_n "checking for cos in -lm... " >&6; } | ||
13837 | if test "${ac_cv_lib_m_cos+set}" = set; then : | ||
13838 | $as_echo_n "(cached) " >&6 | ||
13839 | else | ||
13840 | ac_check_lib_save_LIBS=$LIBS | ||
13841 | LIBS="-lm $LIBS" | ||
13842 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
13843 | /* end confdefs.h. */ | ||
13844 | |||
13845 | /* Override any GCC internal prototype to avoid an error. | ||
13846 | Use char because int might match the return type of a GCC | ||
13847 | builtin and then its argument prototype would still apply. */ | ||
13848 | #ifdef __cplusplus | ||
13849 | extern "C" | ||
13850 | #endif | ||
13851 | char cos (); | ||
13852 | int | ||
13853 | main () | ||
13854 | { | ||
13855 | return cos (); | ||
13856 | ; | ||
13857 | return 0; | ||
13858 | } | ||
13859 | _ACEOF | ||
13860 | if ac_fn_c_try_link "$LINENO"; then : | ||
13861 | ac_cv_lib_m_cos=yes | ||
13862 | else | ||
13863 | ac_cv_lib_m_cos=no | ||
13864 | fi | ||
13865 | rm -f core conftest.err conftest.$ac_objext \ | ||
13866 | conftest$ac_exeext conftest.$ac_ext | ||
13867 | LIBS=$ac_check_lib_save_LIBS | ||
13868 | fi | ||
13869 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 | ||
13870 | $as_echo "$ac_cv_lib_m_cos" >&6; } | ||
13871 | if test "x$ac_cv_lib_m_cos" = x""yes; then : | ||
13872 | LIBM="-lm" | ||
13873 | fi | ||
13874 | |||
13875 | ;; | ||
13876 | esac | ||
13877 | |||
13878 | |||
13879 | |||
14048 | # Provided by math.h | 13880 | # Provided by math.h |
14049 | save_LDFLAGS="$LDFLAGS" | ||
14050 | LDFLAGS="$LDFLAGS -lm" | ||
14051 | 13881 | ||
13882 | LDFLAGS="$LDFLAGS $LIBM" | ||
14052 | for ac_func in pow sqrt finite floor | 13883 | for ac_func in pow sqrt finite floor |
14053 | do : | 13884 | do : |
14054 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | 13885 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
@@ -14091,8 +13922,8 @@ $as_echo "#define isinf(x) (!finite(x) && x==x)" >>confdefs.h | |||
14091 | 13922 | ||
14092 | fi | 13923 | fi |
14093 | 13924 | ||
14094 | 13925 | LIBS="$LIBS $LIBM" | |
14095 | LDFLAGS="$save_LDFLAGS" | 13926 | LDFLAGS="$save_LIBS" |
14096 | 13927 | ||
14097 | # Provided by regex.h | 13928 | # Provided by regex.h |
14098 | for ac_func in re_comp | 13929 | for ac_func in re_comp |
@@ -21539,7 +21370,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH" | |||
21539 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 | 21370 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 |
21540 | $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } | 21371 | $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } |
21541 | cat > conftest.$ac_ext <<EOF | 21372 | cat > conftest.$ac_ext <<EOF |
21542 | #line 21542 "configure" | 21373 | #line 21373 "configure" |
21543 | #include "confdefs.h" | 21374 | #include "confdefs.h" |
21544 | 21375 | ||
21545 | #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" | 21376 | #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" |
@@ -21851,7 +21682,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS" | |||
21851 | $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } | 21682 | $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } |
21852 | 21683 | ||
21853 | cat > conftest.$ac_ext <<EOF | 21684 | cat > conftest.$ac_ext <<EOF |
21854 | #line 21854 "configure" | 21685 | #line 21685 "configure" |
21855 | #include "confdefs.h" | 21686 | #include "confdefs.h" |
21856 | 21687 | ||
21857 | #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" | 21688 | #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" |
@@ -22433,7 +22264,7 @@ $as_echo_n "checking batik-all... " >&6; } | |||
22433 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22264 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
22434 | 22265 | ||
22435 | cat << \EOF > conftest.java | 22266 | cat << \EOF > conftest.java |
22436 | // #line 22436 "configure" | 22267 | // #line 22267 "configure" |
22437 | import org.apache.batik.parser.Parser; | 22268 | import org.apache.batik.parser.Parser; |
22438 | 22269 | ||
22439 | public class conftest { | 22270 | public class conftest { |
@@ -22534,7 +22365,7 @@ $as_echo_n "checking batik... " >&6; } | |||
22534 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22365 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
22535 | 22366 | ||
22536 | cat << \EOF > conftest.java | 22367 | cat << \EOF > conftest.java |
22537 | // #line 22537 "configure" | 22368 | // #line 22368 "configure" |
22538 | import org.apache.batik.parser.Parser; | 22369 | import org.apache.batik.parser.Parser; |
22539 | 22370 | ||
22540 | public class conftest { | 22371 | public class conftest { |
@@ -22637,7 +22468,7 @@ $as_echo_n "checking saxon... " >&6; } | |||
22637 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22468 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
22638 | 22469 | ||
22639 | cat << \EOF > conftest.java | 22470 | cat << \EOF > conftest.java |
22640 | // #line 22640 "configure" | 22471 | // #line 22471 "configure" |
22641 | import com.icl.saxon.Loader; | 22472 | import com.icl.saxon.Loader; |
22642 | 22473 | ||
22643 | public class conftest { | 22474 | public class conftest { |
@@ -22738,7 +22569,7 @@ $as_echo_n "checking fop... " >&6; } | |||
22738 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22569 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
22739 | 22570 | ||
22740 | cat << \EOF > conftest.java | 22571 | cat << \EOF > conftest.java |
22741 | // #line 22741 "configure" | 22572 | // #line 22572 "configure" |
22742 | import org.apache.fop.pdf.PDFInfo; | 22573 | import org.apache.fop.pdf.PDFInfo; |
22743 | 22574 | ||
22744 | public class conftest { | 22575 | public class conftest { |
@@ -22818,107 +22649,6 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar fop used b | |||
22818 | FOP=$PACKAGE_JAR_FILE | 22649 | FOP=$PACKAGE_JAR_FILE |
22819 | 22650 | ||
22820 | 22651 | ||
22821 | # MathML rendering solution | ||
22822 | |||
22823 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5 | ||
22824 | $as_echo_n "checking jeuclid-core... " >&6; } | ||
22825 | PACKAGE_JAR_FILE= | ||
22826 | found_jar=no | ||
22827 | saved_ac_java_classpath=$ac_java_classpath | ||
22828 | DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)" | ||
22829 | for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do | ||
22830 | for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do | ||
22831 | # jar=`echo $jar|sed -e 's/ /\\ /'` | ||
22832 | # echo "protected $jar" | ||
22833 | # jar_resolved=`ls $jar 2>/dev/null` | ||
22834 | # echo "looking for $jar_resolved" | ||
22835 | # TODO check the behaviour when spaces | ||
22836 | jars_resolved=`ls $jar 2>/dev/null` | ||
22837 | for jar_resolved in $jars_resolved; do # If several jars matches | ||
22838 | if test -e "$jar_resolved"; then | ||
22839 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | ||
22840 | |||
22841 | cat << \EOF > conftest.java | ||
22842 | // #line 22842 "configure" | ||
22843 | import net.sourceforge.jeuclid.LayoutContext; | ||
22844 | |||
22845 | public class conftest { | ||
22846 | public static void main(String[] argv) { | ||
22847 | |||
22848 | } | ||
22849 | } | ||
22850 | EOF | ||
22851 | |||
22852 | CLASSPATH=$ac_java_classpath | ||
22853 | export CLASSPATH | ||
22854 | cmd="$JAVAC ${JAVAC_FLAGS} conftest.java" | ||
22855 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then | ||
22856 | if test ""no"" = "no"; then | ||
22857 | echo "yes" >&5 | ||
22858 | |||
22859 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
22860 | $as_echo "$jar_resolved" >&6; } | ||
22861 | found_jar=yes | ||
22862 | PACKAGE_JAR_FILE=$jar_resolved | ||
22863 | break | ||
22864 | |||
22865 | else | ||
22866 | cmd="$JAVA conftest" | ||
22867 | if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then | ||
22868 | echo "yes" >&5 | ||
22869 | |||
22870 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5 | ||
22871 | $as_echo "$jar_resolved" >&6; } | ||
22872 | found_jar=yes | ||
22873 | PACKAGE_JAR_FILE=$jar_resolved | ||
22874 | break | ||
22875 | |||
22876 | else | ||
22877 | echo "configure: failed program was:" >&5 | ||
22878 | cat conftest.java >&5 | ||
22879 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
22880 | |||
22881 | ac_java_classpath=$saved_ac_java_classpath | ||
22882 | |||
22883 | |||
22884 | fi | ||
22885 | fi | ||
22886 | else | ||
22887 | echo "configure: failed program was:" >&5 | ||
22888 | cat conftest.java >&5 | ||
22889 | echo "configure: CLASSPATH was $CLASSPATH" >&5 | ||
22890 | |||
22891 | ac_java_classpath=$saved_ac_java_classpath | ||
22892 | |||
22893 | |||
22894 | fi | ||
22895 | |||
22896 | fi | ||
22897 | done | ||
22898 | # If ls returns several results and the first one is OK, stop the search | ||
22899 | if test "$found_jar" = "yes"; then | ||
22900 | break | ||
22901 | fi | ||
22902 | done | ||
22903 | # If found, no need to search in other directory | ||
22904 | if test "$found_jar" = "yes"; then | ||
22905 | break | ||
22906 | fi | ||
22907 | done | ||
22908 | if test "$found_jar" = "no"; then | ||
22909 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22910 | $as_echo "no" >&6; } | ||
22911 | if test "" = "yes"; then | ||
22912 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5 | ||
22913 | $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;} | ||
22914 | else | ||
22915 | as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5 | ||
22916 | fi | ||
22917 | fi | ||
22918 | |||
22919 | JEUCLID_CORE=$PACKAGE_JAR_FILE | ||
22920 | |||
22921 | |||
22922 | # Commons I/O library | 22652 | # Commons I/O library |
22923 | 22653 | ||
22924 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5 | 22654 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5 |
@@ -22940,7 +22670,7 @@ $as_echo_n "checking commons-io... " >&6; } | |||
22940 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22670 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
22941 | 22671 | ||
22942 | cat << \EOF > conftest.java | 22672 | cat << \EOF > conftest.java |
22943 | // #line 22943 "configure" | 22673 | // #line 22673 "configure" |
22944 | import org.apache.commons.io.output.CountingOutputStream; | 22674 | import org.apache.commons.io.output.CountingOutputStream; |
22945 | 22675 | ||
22946 | public class conftest { | 22676 | public class conftest { |
@@ -23041,7 +22771,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; } | |||
23041 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22771 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
23042 | 22772 | ||
23043 | cat << \EOF > conftest.java | 22773 | cat << \EOF > conftest.java |
23044 | // #line 23044 "configure" | 22774 | // #line 22774 "configure" |
23045 | import org.apache.xmlgraphics.util.Service; | 22775 | import org.apache.xmlgraphics.util.Service; |
23046 | 22776 | ||
23047 | public class conftest { | 22777 | public class conftest { |
@@ -23142,7 +22872,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; } | |||
23142 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22872 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
23143 | 22873 | ||
23144 | cat << \EOF > conftest.java | 22874 | cat << \EOF > conftest.java |
23145 | // #line 23145 "configure" | 22875 | // #line 22875 "configure" |
23146 | import org.w3c.dom.svg.SVGDocument; | 22876 | import org.w3c.dom.svg.SVGDocument; |
23147 | 22877 | ||
23148 | public class conftest { | 22878 | public class conftest { |
@@ -23243,7 +22973,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; } | |||
23243 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 22973 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
23244 | 22974 | ||
23245 | cat << \EOF > conftest.java | 22975 | cat << \EOF > conftest.java |
23246 | // #line 23246 "configure" | 22976 | // #line 22976 "configure" |
23247 | import org.w3c.dom.svg.SVGDocument; | 22977 | import org.w3c.dom.svg.SVGDocument; |
23248 | 22978 | ||
23249 | public class conftest { | 22979 | public class conftest { |
@@ -23348,7 +23078,7 @@ $as_echo_n "checking avalon-framework... " >&6; } | |||
23348 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" | 23078 | export ac_java_classpath="$jar_resolved:$ac_java_classpath" |
23349 | 23079 | ||
23350 | cat << \EOF > conftest.java | 23080 | cat << \EOF > conftest.java |
23351 | // #line 23351 "configure" | 23081 | // #line 23081 "configure" |
23352 | import org.apache.avalon.framework.configuration.ConfigurationException; | 23082 | import org.apache.avalon.framework.configuration.ConfigurationException; |
23353 | 23083 | ||
23354 | public class conftest { | 23084 | public class conftest { |
@@ -29619,7 +29349,7 @@ else | |||
29619 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 29349 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
29620 | lt_status=$lt_dlunknown | 29350 | lt_status=$lt_dlunknown |
29621 | cat > conftest.$ac_ext <<_LT_EOF | 29351 | cat > conftest.$ac_ext <<_LT_EOF |
29622 | #line 29622 "configure" | 29352 | #line 29352 "configure" |
29623 | #include "confdefs.h" | 29353 | #include "confdefs.h" |
29624 | 29354 | ||
29625 | #if HAVE_DLFCN_H | 29355 | #if HAVE_DLFCN_H |
@@ -29725,7 +29455,7 @@ else | |||
29725 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 29455 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
29726 | lt_status=$lt_dlunknown | 29456 | lt_status=$lt_dlunknown |
29727 | cat > conftest.$ac_ext <<_LT_EOF | 29457 | cat > conftest.$ac_ext <<_LT_EOF |
29728 | #line 29728 "configure" | 29458 | #line 29458 "configure" |
29729 | #include "confdefs.h" | 29459 | #include "confdefs.h" |
29730 | 29460 | ||
29731 | #if HAVE_DLFCN_H | 29461 | #if HAVE_DLFCN_H |
@@ -39122,7 +38852,6 @@ if test $HELP_ENABLE = yes; then | |||
39122 | echo " Batik (SVG) ............ = $BATIK" | 38852 | echo " Batik (SVG) ............ = $BATIK" |
39123 | echo " Saxon XSLT ............. = $SAXON" | 38853 | echo " Saxon XSLT ............. = $SAXON" |
39124 | echo " FOP (XML => PDF) ....... = $FOP" | 38854 | echo " FOP (XML => PDF) ....... = $FOP" |
39125 | echo " Jeuclid (MathML) ....... = $JEUCLID_CORE" | ||
39126 | echo " Commons I/O ............ = $COMMONS_IO" | 38855 | echo " Commons I/O ............ = $COMMONS_IO" |
39127 | echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" | 38856 | echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" |
39128 | echo " XML commons external ... = $XML_APIS_EXT" | 38857 | echo " XML commons external ... = $XML_APIS_EXT" |
@@ -39157,6 +38886,7 @@ echo " JOGL ................ = $JOGL" | |||
39157 | echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" | 38886 | echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" |
39158 | echo " Gluegen ............. = $GLUEGEN_RT" | 38887 | echo " Gluegen ............. = $GLUEGEN_RT" |
39159 | echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" | 38888 | echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" |
38889 | echo " Jeuclid (MathML) .... = $JEUCLID_CORE" | ||
39160 | echo " Jhall .............. = $JHALL" | 38890 | echo " Jhall .............. = $JHALL" |
39161 | echo " Jrosetta (API) ...... = $JROSETTA_API" | 38891 | echo " Jrosetta (API) ...... = $JROSETTA_API" |
39162 | echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" | 38892 | echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" |
@@ -39170,7 +38900,6 @@ echo "Code quality (optional):" | |||
39170 | echo " Checkstyle .......... = $CHECKSTYLE" | 38900 | echo " Checkstyle .......... = $CHECKSTYLE" |
39171 | echo " Commons-beanutils ... = $COMMONS_BEANUTILS" | 38901 | echo " Commons-beanutils ... = $COMMONS_BEANUTILS" |
39172 | echo " Antlr ............... = $ANTLR" | 38902 | echo " Antlr ............... = $ANTLR" |
39173 | echo " TestNG .............. = $TESTNG" | ||
39174 | echo " splint .............. = $SPLINT" | 38903 | echo " splint .............. = $SPLINT" |
39175 | 38904 | ||
39176 | echo "" | 38905 | echo "" |
diff --git a/scilab/configure.ac b/scilab/configure.ac index 98d97e8..cfca03e 100644 --- a/scilab/configure.ac +++ b/scilab/configure.ac | |||
@@ -749,6 +749,14 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no | |||
749 | JROSETTA_ENGINE=$PACKAGE_JAR_FILE | 749 | JROSETTA_ENGINE=$PACKAGE_JAR_FILE |
750 | AC_SUBST(JROSETTA_ENGINE) | 750 | AC_SUBST(JROSETTA_ENGINE) |
751 | 751 | ||
752 | |||
753 | # MathML rendering solution | ||
754 | # Used in both graphic & help | ||
755 | AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)]) | ||
756 | JEUCLID_CORE=$PACKAGE_JAR_FILE | ||
757 | AC_SUBST(JEUCLID_CORE) | ||
758 | |||
759 | |||
752 | if test $HDF5_ENABLE = yes; then | 760 | if test $HDF5_ENABLE = yes; then |
753 | # HDF5 java lib | 761 | # HDF5 java lib |
754 | AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library]) | 762 | AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library]) |
@@ -911,10 +919,14 @@ AC_CHECK_FUNCS([mkdir]) | |||
911 | # Provided by mman.h | 919 | # Provided by mman.h |
912 | AC_CHECK_FUNCS([munmap]) | 920 | AC_CHECK_FUNCS([munmap]) |
913 | 921 | ||
922 | |||
923 | # Check of the libm (lib math). Macro provided by libtool. | ||
924 | save_LDFLAGS="$LIBS" | ||
925 | LT_LIB_M() | ||
926 | |||
914 | # Provided by math.h | 927 | # Provided by math.h |
915 | save_LDFLAGS="$LDFLAGS" | ||
916 | LDFLAGS="$LDFLAGS -lm" | ||
917 | 928 | ||
929 | LDFLAGS="$LDFLAGS $LIBM" | ||
918 | AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor]) | 930 | AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor]) |
919 | 931 | ||
920 | AC_CHECK_FUNC([exp10],,[ | 932 | AC_CHECK_FUNC([exp10],,[ |
@@ -927,8 +939,8 @@ AC_CHECK_FUNC([exp10],,[ | |||
927 | AC_CHECK_FUNC([isinf],,[ | 939 | AC_CHECK_FUNC([isinf],,[ |
928 | AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf]) | 940 | AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf]) |
929 | ]) | 941 | ]) |
930 | 942 | LIBS="$LIBS $LIBM" | |
931 | LDFLAGS="$save_LDFLAGS" | 943 | LDFLAGS="$save_LIBS" |
932 | 944 | ||
933 | # Provided by regex.h | 945 | # Provided by regex.h |
934 | AC_CHECK_FUNCS([re_comp]) | 946 | AC_CHECK_FUNCS([re_comp]) |
@@ -1789,7 +1801,6 @@ if test $HELP_ENABLE = yes; then | |||
1789 | echo " Batik (SVG) ............ = $BATIK" | 1801 | echo " Batik (SVG) ............ = $BATIK" |
1790 | echo " Saxon XSLT ............. = $SAXON" | 1802 | echo " Saxon XSLT ............. = $SAXON" |
1791 | echo " FOP (XML => PDF) ....... = $FOP" | 1803 | echo " FOP (XML => PDF) ....... = $FOP" |
1792 | echo " Jeuclid (MathML) ....... = $JEUCLID_CORE" | ||
1793 | echo " Commons I/O ............ = $COMMONS_IO" | 1804 | echo " Commons I/O ............ = $COMMONS_IO" |
1794 | echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" | 1805 | echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" |
1795 | echo " XML commons external ... = $XML_APIS_EXT" | 1806 | echo " XML commons external ... = $XML_APIS_EXT" |
@@ -1824,6 +1835,7 @@ echo " JOGL ................ = $JOGL" | |||
1824 | echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" | 1835 | echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" |
1825 | echo " Gluegen ............. = $GLUEGEN_RT" | 1836 | echo " Gluegen ............. = $GLUEGEN_RT" |
1826 | echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" | 1837 | echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" |
1838 | echo " Jeuclid (MathML) .... = $JEUCLID_CORE" | ||
1827 | echo " Jhall .............. = $JHALL" | 1839 | echo " Jhall .............. = $JHALL" |
1828 | echo " Jrosetta (API) ...... = $JROSETTA_API" | 1840 | echo " Jrosetta (API) ...... = $JROSETTA_API" |
1829 | echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" | 1841 | echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" |
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in index 2243dd3..b2057be 100644 --- a/scilab/contrib/Makefile.in +++ b/scilab/contrib/Makefile.in | |||
@@ -158,6 +158,7 @@ LD = @LD@ | |||
158 | LDFLAGS = @LDFLAGS@ | 158 | LDFLAGS = @LDFLAGS@ |
159 | LIBICONV = @LIBICONV@ | 159 | LIBICONV = @LIBICONV@ |
160 | LIBINTL = @LIBINTL@ | 160 | LIBINTL = @LIBINTL@ |
161 | LIBM = @LIBM@ | ||
161 | LIBOBJS = @LIBOBJS@ | 162 | LIBOBJS = @LIBOBJS@ |
162 | LIBS = @LIBS@ | 163 | LIBS = @LIBS@ |
163 | LIBTOOL = @LIBTOOL@ | 164 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in index 6b3f5a0..a589263 100644 --- a/scilab/libs/MALLOC/Makefile.in +++ b/scilab/libs/MALLOC/Makefile.in | |||
@@ -224,6 +224,7 @@ LD = @LD@ | |||
224 | LDFLAGS = @LDFLAGS@ | 224 | LDFLAGS = @LDFLAGS@ |
225 | LIBICONV = @LIBICONV@ | 225 | LIBICONV = @LIBICONV@ |
226 | LIBINTL = @LIBINTL@ | 226 | LIBINTL = @LIBINTL@ |
227 | LIBM = @LIBM@ | ||
227 | LIBOBJS = @LIBOBJS@ | 228 | LIBOBJS = @LIBOBJS@ |
228 | LIBS = @LIBS@ | 229 | LIBS = @LIBS@ |
229 | LIBTOOL = @LIBTOOL@ | 230 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in index 6d6f573..b00175a 100644 --- a/scilab/libs/Makefile.in +++ b/scilab/libs/Makefile.in | |||
@@ -196,6 +196,7 @@ LD = @LD@ | |||
196 | LDFLAGS = @LDFLAGS@ | 196 | LDFLAGS = @LDFLAGS@ |
197 | LIBICONV = @LIBICONV@ | 197 | LIBICONV = @LIBICONV@ |
198 | LIBINTL = @LIBINTL@ | 198 | LIBINTL = @LIBINTL@ |
199 | LIBM = @LIBM@ | ||
199 | LIBOBJS = @LIBOBJS@ | 200 | LIBOBJS = @LIBOBJS@ |
200 | LIBS = @LIBS@ | 201 | LIBS = @LIBS@ |
201 | LIBTOOL = @LIBTOOL@ | 202 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in index 0a4cd33..9e32496 100644 --- a/scilab/libs/doublylinkedlist/Makefile.in +++ b/scilab/libs/doublylinkedlist/Makefile.in | |||
@@ -226,6 +226,7 @@ LD = @LD@ | |||
226 | LDFLAGS = @LDFLAGS@ | 226 | LDFLAGS = @LDFLAGS@ |
227 | LIBICONV = @LIBICONV@ | 227 | LIBICONV = @LIBICONV@ |
228 | LIBINTL = @LIBINTL@ | 228 | LIBINTL = @LIBINTL@ |
229 | LIBM = @LIBM@ | ||
229 | LIBOBJS = @LIBOBJS@ | 230 | LIBOBJS = @LIBOBJS@ |
230 | LIBS = @LIBS@ | 231 | LIBS = @LIBS@ |
231 | LIBTOOL = @LIBTOOL@ | 232 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in index 91f15bc0..819b487 100644 --- a/scilab/libs/dynamiclibrary/Makefile.in +++ b/scilab/libs/dynamiclibrary/Makefile.in | |||
@@ -226,6 +226,7 @@ LD = @LD@ | |||
226 | LDFLAGS = @LDFLAGS@ | 226 | LDFLAGS = @LDFLAGS@ |
227 | LIBICONV = @LIBICONV@ | 227 | LIBICONV = @LIBICONV@ |
228 | LIBINTL = @LIBINTL@ | 228 | LIBINTL = @LIBINTL@ |
229 | LIBM = @LIBM@ | ||
229 | LIBOBJS = @LIBOBJS@ | 230 | LIBOBJS = @LIBOBJS@ |
230 | LIBS = @LIBS@ | 231 | LIBS = @LIBS@ |
231 | LIBTOOL = @LIBTOOL@ | 232 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in index b1c4111..f690778 100644 --- a/scilab/libs/hashtable/Makefile.in +++ b/scilab/libs/hashtable/Makefile.in | |||
@@ -224,6 +224,7 @@ LD = @LD@ | |||
224 | LDFLAGS = @LDFLAGS@ | 224 | LDFLAGS = @LDFLAGS@ |
225 | LIBICONV = @LIBICONV@ | 225 | LIBICONV = @LIBICONV@ |
226 | LIBINTL = @LIBINTL@ | 226 | LIBINTL = @LIBINTL@ |
227 | LIBM = @LIBM@ | ||
227 | LIBOBJS = @LIBOBJS@ | 228 | LIBOBJS = @LIBOBJS@ |
228 | LIBS = @LIBS@ | 229 | LIBS = @LIBS@ |
229 | LIBTOOL = @LIBTOOL@ | 230 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in index 866df66..fc421cb 100644 --- a/scilab/libs/libst/Makefile.in +++ b/scilab/libs/libst/Makefile.in | |||
@@ -220,6 +220,7 @@ LD = @LD@ | |||
220 | LDFLAGS = @LDFLAGS@ | 220 | LDFLAGS = @LDFLAGS@ |
221 | LIBICONV = @LIBICONV@ | 221 | LIBICONV = @LIBICONV@ |
222 | LIBINTL = @LIBINTL@ | 222 | LIBINTL = @LIBINTL@ |
223 | LIBM = @LIBM@ | ||
223 | LIBOBJS = @LIBOBJS@ | 224 | LIBOBJS = @LIBOBJS@ |
224 | LIBS = @LIBS@ | 225 | LIBS = @LIBS@ |
225 | LIBTOOL = @LIBTOOL@ | 226 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/m4/docbook.m4 b/scilab/m4/docbook.m4 index e017774..7fbbcca 100644 --- a/scilab/m4/docbook.m4 +++ b/scilab/m4/docbook.m4 | |||
@@ -54,11 +54,6 @@ AC_ARG_WITH(docbook, | |||
54 | FOP=$PACKAGE_JAR_FILE | 54 | FOP=$PACKAGE_JAR_FILE |
55 | AC_SUBST(FOP) | 55 | AC_SUBST(FOP) |
56 | 56 | ||
57 | # MathML rendering solution | ||
58 | AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)]) | ||
59 | JEUCLID_CORE=$PACKAGE_JAR_FILE | ||
60 | AC_SUBST(JEUCLID_CORE) | ||
61 | |||
62 | # Commons I/O library | 57 | # Commons I/O library |
63 | AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) | 58 | AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) |
64 | COMMONS_IO=$PACKAGE_JAR_FILE | 59 | COMMONS_IO=$PACKAGE_JAR_FILE |
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in index 67c1d96..92f0882 100644 --- a/scilab/modules/Makefile.in +++ b/scilab/modules/Makefile.in | |||
@@ -282,6 +282,7 @@ LD = @LD@ | |||
282 | LDFLAGS = @LDFLAGS@ | 282 | LDFLAGS = @LDFLAGS@ |
283 | LIBICONV = @LIBICONV@ | 283 | LIBICONV = @LIBICONV@ |
284 | LIBINTL = @LIBINTL@ | 284 | LIBINTL = @LIBINTL@ |
285 | LIBM = @LIBM@ | ||
285 | LIBOBJS = @LIBOBJS@ | 286 | LIBOBJS = @LIBOBJS@ |
286 | LIBS = @LIBS@ | 287 | LIBS = @LIBS@ |
287 | LIBTOOL = @LIBTOOL@ | 288 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in index 1e3da63..163ff0a 100644 --- a/scilab/modules/action_binding/Makefile.in +++ b/scilab/modules/action_binding/Makefile.in | |||
@@ -247,6 +247,7 @@ LD = @LD@ | |||
247 | LDFLAGS = @LDFLAGS@ | 247 | LDFLAGS = @LDFLAGS@ |
248 | LIBICONV = @LIBICONV@ | 248 | LIBICONV = @LIBICONV@ |
249 | LIBINTL = @LIBINTL@ | 249 | LIBINTL = @LIBINTL@ |
250 | LIBM = @LIBM@ | ||
250 | LIBOBJS = @LIBOBJS@ | 251 | LIBOBJS = @LIBOBJS@ |
251 | LIBS = @LIBS@ | 252 | LIBS = @LIBS@ |
252 | LIBTOOL = @LIBTOOL@ | 253 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in index c8912dc..e3d3268 100644 --- a/scilab/modules/api_scilab/Makefile.in +++ b/scilab/modules/api_scilab/Makefile.in | |||
@@ -241,6 +241,7 @@ LD = @LD@ | |||
241 | LDFLAGS = @LDFLAGS@ | 241 | LDFLAGS = @LDFLAGS@ |
242 | LIBICONV = @LIBICONV@ | 242 | LIBICONV = @LIBICONV@ |
243 | LIBINTL = @LIBINTL@ | 243 | LIBINTL = @LIBINTL@ |
244 | LIBM = @LIBM@ | ||
244 | LIBOBJS = @LIBOBJS@ | 245 | LIBOBJS = @LIBOBJS@ |
245 | LIBS = @LIBS@ | 246 | LIBS = @LIBS@ |
246 | LIBTOOL = @LIBTOOL@ | 247 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in index fc38387..d839ccb 100644 --- a/scilab/modules/arnoldi/Makefile.in +++ b/scilab/modules/arnoldi/Makefile.in | |||
@@ -263,6 +263,7 @@ LD = @LD@ | |||
263 | LDFLAGS = @LDFLAGS@ | 263 | LDFLAGS = @LDFLAGS@ |
264 | LIBICONV = @LIBICONV@ | 264 | LIBICONV = @LIBICONV@ |
265 | LIBINTL = @LIBINTL@ | 265 | LIBINTL = @LIBINTL@ |
266 | LIBM = @LIBM@ | ||
266 | LIBOBJS = @LIBOBJS@ | 267 | LIBOBJS = @LIBOBJS@ |
267 | LIBS = @LIBS@ | 268 | LIBS = @LIBS@ |
268 | LIBTOOL = @LIBTOOL@ | 269 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in index 51a666c..99de7ef 100644 --- a/scilab/modules/atoms/Makefile.in +++ b/scilab/modules/atoms/Makefile.in | |||
@@ -203,6 +203,7 @@ LD = @LD@ | |||
203 | LDFLAGS = @LDFLAGS@ | 203 | LDFLAGS = @LDFLAGS@ |
204 | LIBICONV = @LIBICONV@ | 204 | LIBICONV = @LIBICONV@ |
205 | LIBINTL = @LIBINTL@ | 205 | LIBINTL = @LIBINTL@ |
206 | LIBM = @LIBM@ | ||
206 | LIBOBJS = @LIBOBJS@ | 207 | LIBOBJS = @LIBOBJS@ |
207 | LIBS = @LIBS@ | 208 | LIBS = @LIBS@ |
208 | LIBTOOL = @LIBTOOL@ | 209 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in index a1dbb01..6a0dc7e 100644 --- a/scilab/modules/boolean/Makefile.in +++ b/scilab/modules/boolean/Makefile.in | |||
@@ -242,6 +242,7 @@ LD = @LD@ | |||
242 | LDFLAGS = @LDFLAGS@ | 242 | LDFLAGS = @LDFLAGS@ |
243 | LIBICONV = @LIBICONV@ | 243 | LIBICONV = @LIBICONV@ |
244 | LIBINTL = @LIBINTL@ | 244 | LIBINTL = @LIBINTL@ |
245 | LIBM = @LIBM@ | ||
245 | LIBOBJS = @LIBOBJS@ | 246 | LIBOBJS = @LIBOBJS@ |
246 | LIBS = @LIBS@ | 247 | LIBS = @LIBS@ |
247 | LIBTOOL = @LIBTOOL@ | 248 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in index 50c18fa..a15defb 100644 --- a/scilab/modules/cacsd/Makefile.in +++ b/scilab/modules/cacsd/Makefile.in | |||
@@ -337,6 +337,7 @@ LD = @LD@ | |||
337 | LDFLAGS = @LDFLAGS@ | 337 | LDFLAGS = @LDFLAGS@ |
338 | LIBICONV = @LIBICONV@ | 338 | LIBICONV = @LIBICONV@ |
339 | LIBINTL = @LIBINTL@ | 339 | LIBINTL = @LIBINTL@ |
340 | LIBM = @LIBM@ | ||
340 | LIBOBJS = @LIBOBJS@ | 341 | LIBOBJS = @LIBOBJS@ |
341 | LIBS = @LIBS@ | 342 | LIBS = @LIBS@ |
342 | LIBTOOL = @LIBTOOL@ | 343 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in index 522d64e..0c62abd 100644 --- a/scilab/modules/call_scilab/Makefile.in +++ b/scilab/modules/call_scilab/Makefile.in | |||
@@ -238,6 +238,7 @@ LD = @LD@ | |||
238 | LDFLAGS = @LDFLAGS@ | 238 | LDFLAGS = @LDFLAGS@ |
239 | LIBICONV = @LIBICONV@ | 239 | LIBICONV = @LIBICONV@ |
240 | LIBINTL = @LIBINTL@ | 240 | LIBINTL = @LIBINTL@ |
241 | LIBM = @LIBM@ | ||
241 | LIBOBJS = @LIBOBJS@ | 242 | LIBOBJS = @LIBOBJS@ |
242 | LIBS = @LIBS@ | 243 | LIBS = @LIBS@ |
243 | LIBTOOL = @LIBTOOL@ | 244 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in index 916059b..11ac5cf 100644 --- a/scilab/modules/compatibility_functions/Makefile.in +++ b/scilab/modules/compatibility_functions/Makefile.in | |||
@@ -202,6 +202,7 @@ LD = @LD@ | |||
202 | LDFLAGS = @LDFLAGS@ | 202 | LDFLAGS = @LDFLAGS@ |
203 | LIBICONV = @LIBICONV@ | 203 | LIBICONV = @LIBICONV@ |
204 | LIBINTL = @LIBINTL@ | 204 | LIBINTL = @LIBINTL@ |
205 | LIBM = @LIBM@ | ||
205 | LIBOBJS = @LIBOBJS@ | 206 | LIBOBJS = @LIBOBJS@ |
206 | LIBS = @LIBS@ | 207 | LIBS = @LIBS@ |
207 | LIBTOOL = @LIBTOOL@ | 208 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in index b25d471..94792ce 100644 --- a/scilab/modules/completion/Makefile.in +++ b/scilab/modules/completion/Makefile.in | |||
@@ -264,6 +264,7 @@ LD = @LD@ | |||
264 | LDFLAGS = @LDFLAGS@ | 264 | LDFLAGS = @LDFLAGS@ |
265 | LIBICONV = @LIBICONV@ | 265 | LIBICONV = @LIBICONV@ |
266 | LIBINTL = @LIBINTL@ | 266 | LIBINTL = @LIBINTL@ |
267 | LIBM = @LIBM@ | ||
267 | LIBOBJS = @LIBOBJS@ | 268 | LIBOBJS = @LIBOBJS@ |
268 | LIBS = @LIBS@ | 269 | LIBS = @LIBS@ |
269 | LIBTOOL = @LIBTOOL@ | 270 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in index 2c385d0..4a2e3d4 100644 --- a/scilab/modules/console/Makefile.in +++ b/scilab/modules/console/Makefile.in | |||
@@ -276,6 +276,7 @@ LD = @LD@ | |||
276 | LDFLAGS = @LDFLAGS@ | 276 | LDFLAGS = @LDFLAGS@ |
277 | LIBICONV = @LIBICONV@ | 277 | LIBICONV = @LIBICONV@ |
278 | LIBINTL = @LIBINTL@ | 278 | LIBINTL = @LIBINTL@ |
279 | LIBM = @LIBM@ | ||
279 | LIBOBJS = @LIBOBJS@ | 280 | LIBOBJS = @LIBOBJS@ |
280 | LIBS = @LIBS@ | 281 | LIBS = @LIBS@ |
281 | LIBTOOL = @LIBTOOL@ | 282 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in index e8d515a..c2471ef 100644 --- a/scilab/modules/core/Makefile.in +++ b/scilab/modules/core/Makefile.in | |||
@@ -475,6 +475,7 @@ LD = @LD@ | |||
475 | LDFLAGS = @LDFLAGS@ | 475 | LDFLAGS = @LDFLAGS@ |
476 | LIBICONV = @LIBICONV@ | 476 | LIBICONV = @LIBICONV@ |
477 | LIBINTL = @LIBINTL@ | 477 | LIBINTL = @LIBINTL@ |
478 | LIBM = @LIBM@ | ||
478 | LIBOBJS = @LIBOBJS@ | 479 | LIBOBJS = @LIBOBJS@ |
479 | LIBS = @LIBS@ | 480 | LIBS = @LIBS@ |
480 | LIBTOOL = @LIBTOOL@ | 481 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in index b1eb8e1..53fe905 100644 --- a/scilab/modules/data_structures/Makefile.in +++ b/scilab/modules/data_structures/Makefile.in | |||
@@ -273,6 +273,7 @@ LD = @LD@ | |||
273 | LDFLAGS = @LDFLAGS@ | 273 | LDFLAGS = @LDFLAGS@ |
274 | LIBICONV = @LIBICONV@ | 274 | LIBICONV = @LIBICONV@ |
275 | LIBINTL = @LIBINTL@ | 275 | LIBINTL = @LIBINTL@ |
276 | LIBM = @LIBM@ | ||
276 | LIBOBJS = @LIBOBJS@ | 277 | LIBOBJS = @LIBOBJS@ |
277 | LIBS = @LIBS@ | 278 | LIBS = @LIBS@ |
278 | LIBTOOL = @LIBTOOL@ | 279 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in index af7470e..b226ef3 100644 --- a/scilab/modules/demo_tools/Makefile.in +++ b/scilab/modules/demo_tools/Makefile.in | |||
@@ -201,6 +201,7 @@ LD = @LD@ | |||
201 | LDFLAGS = @LDFLAGS@ | 201 | LDFLAGS = @LDFLAGS@ |
202 | LIBICONV = @LIBICONV@ | 202 | LIBICONV = @LIBICONV@ |
203 | LIBINTL = @LIBINTL@ | 203 | LIBINTL = @LIBINTL@ |
204 | LIBM = @LIBM@ | ||
204 | LIBOBJS = @LIBOBJS@ | 205 | LIBOBJS = @LIBOBJS@ |
205 | LIBS = @LIBS@ | 206 | LIBS = @LIBS@ |
206 | LIBTOOL = @LIBTOOL@ | 207 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in index a6c82ef..1eecddc 100644 --- a/scilab/modules/development_tools/Makefile.in +++ b/scilab/modules/development_tools/Makefile.in | |||
@@ -200,6 +200,7 @@ LD = @LD@ | |||
200 | LDFLAGS = @LDFLAGS@ | 200 | LDFLAGS = @LDFLAGS@ |
201 | LIBICONV = @LIBICONV@ | 201 | LIBICONV = @LIBICONV@ |
202 | LIBINTL = @LIBINTL@ | 202 | LIBINTL = @LIBINTL@ |
203 | LIBM = @LIBM@ | ||
203 | LIBOBJS = @LIBOBJS@ | 204 | LIBOBJS = @LIBOBJS@ |
204 | LIBS = @LIBS@ | 205 | LIBS = @LIBS@ |
205 | LIBTOOL = @LIBTOOL@ | 206 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in index a904129..7e6d748 100644 --- a/scilab/modules/development_tools/src/fake/Makefile.in +++ b/scilab/modules/development_tools/src/fake/Makefile.in | |||
@@ -151,6 +151,7 @@ LD = @LD@ | |||
151 | LDFLAGS = @LDFLAGS@ | 151 | LDFLAGS = @LDFLAGS@ |
152 | LIBICONV = @LIBICONV@ | 152 | LIBICONV = @LIBICONV@ |
153 | LIBINTL = @LIBINTL@ | 153 | LIBINTL = @LIBINTL@ |
154 | LIBM = @LIBM@ | ||
154 | LIBOBJS = @LIBOBJS@ | 155 | LIBOBJS = @LIBOBJS@ |
155 | LIBS = @LIBS@ | 156 | LIBS = @LIBS@ |
156 | LIBTOOL = @LIBTOOL@ | 157 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in index 8de7549..10a965b 100644 --- a/scilab/modules/differential_equations/Makefile.in +++ b/scilab/modules/differential_equations/Makefile.in | |||
@@ -284,6 +284,7 @@ LD = @LD@ | |||
284 | LDFLAGS = @LDFLAGS@ | 284 | LDFLAGS = @LDFLAGS@ |
285 | LIBICONV = @LIBICONV@ | 285 | LIBICONV = @LIBICONV@ |
286 | LIBINTL = @LIBINTL@ | 286 | LIBINTL = @LIBINTL@ |
287 | LIBM = @LIBM@ | ||
287 | LIBOBJS = @LIBOBJS@ | 288 | LIBOBJS = @LIBOBJS@ |
288 | LIBS = @LIBS@ | 289 | LIBS = @LIBS@ |
289 | LIBTOOL = @LIBTOOL@ | 290 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in index de4a33d..6a904b4 100644 --- a/scilab/modules/double/Makefile.in +++ b/scilab/modules/double/Makefile.in | |||
@@ -242,6 +242,7 @@ LD = @LD@ | |||
242 | LDFLAGS = @LDFLAGS@ | 242 | LDFLAGS = @LDFLAGS@ |
243 | LIBICONV = @LIBICONV@ | 243 | LIBICONV = @LIBICONV@ |
244 | LIBINTL = @LIBINTL@ | 244 | LIBINTL = @LIBINTL@ |
245 | LIBM = @LIBM@ | ||
245 | LIBOBJS = @LIBOBJS@ | 246 | LIBOBJS = @LIBOBJS@ |
246 | LIBS = @LIBS@ | 247 | LIBS = @LIBS@ |
247 | LIBTOOL = @LIBTOOL@ | 248 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in index aa17267..25bed5d 100644 --- a/scilab/modules/dynamic_link/Makefile.in +++ b/scilab/modules/dynamic_link/Makefile.in | |||
@@ -259,6 +259,7 @@ LD = @LD@ | |||
259 | LDFLAGS = @LDFLAGS@ | 259 | LDFLAGS = @LDFLAGS@ |
260 | LIBICONV = @LIBICONV@ | 260 | LIBICONV = @LIBICONV@ |
261 | LIBINTL = @LIBINTL@ | 261 | LIBINTL = @LIBINTL@ |
262 | LIBM = @LIBM@ | ||
262 | LIBOBJS = @LIBOBJS@ | 263 | LIBOBJS = @LIBOBJS@ |
263 | LIBS = @LIBS@ | 264 | LIBS = @LIBS@ |
264 | LIBTOOL = @LIBTOOL@ | 265 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in index 9ad3d0a..d231aab 100644 --- a/scilab/modules/elementary_functions/Makefile.in +++ b/scilab/modules/elementary_functions/Makefile.in | |||
@@ -611,6 +611,7 @@ LD = @LD@ | |||
611 | LDFLAGS = @LDFLAGS@ | 611 | LDFLAGS = @LDFLAGS@ |
612 | LIBICONV = @LIBICONV@ | 612 | LIBICONV = @LIBICONV@ |
613 | LIBINTL = @LIBINTL@ | 613 | LIBINTL = @LIBINTL@ |
614 | LIBM = @LIBM@ | ||
614 | LIBOBJS = @LIBOBJS@ | 615 | LIBOBJS = @LIBOBJS@ |
615 | LIBS = @LIBS@ | 616 | LIBS = @LIBS@ |
616 | LIBTOOL = @LIBTOOL@ | 617 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/elementary_functions/macros/tand.sci b/scilab/modules/elementary_functions/macros/tand.sci index 43d0219..2394270 100644 --- a/scilab/modules/elementary_functions/macros/tand.sci +++ b/scilab/modules/elementary_functions/macros/tand.sci | |||
@@ -1,5 +1,6 @@ | |||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) INRIA, Serge Steer | 2 | // Copyright (C) INRIA, Serge Steer |
3 | // Copyright (C) 2010 - DIGITEO - Michael Baudin | ||
3 | // | 4 | // |
4 | // This file must be used under the terms of the CeCILL. | 5 | // This file must be used under the terms of the CeCILL. |
5 | // This source file is licensed as described in the file COPYING, which | 6 | // This source file is licensed as described in the file COPYING, which |
@@ -8,19 +9,18 @@ | |||
8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | 9 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt |
9 | function y = tand(x) | 10 | function y = tand(x) |
10 | // Tangent of x in degrees. | 11 | // Tangent of x in degrees. |
11 | if ~isreal(x) then | 12 | // tand(x) = tan(x*%pi/180) in the mathematical sense |
13 | // But floating point numbers behave differently. | ||
14 | // For example, tand(180) = 0 while tan(pi) = -1.225D-16 | ||
15 | if ( ~isreal(x) ) then | ||
12 | error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1)); | 16 | error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1)); |
13 | end | 17 | end |
14 | 18 | // Argument reduction toward [-90,90[ | |
15 | n = round(x/90); | 19 | n = round(x/180) |
16 | x = x - n*90; | 20 | x = x - n*180 |
17 | z = (x == 0); | 21 | y = tan(%pi/180*x) |
18 | m = pmodulo(n,2); | 22 | // Set all singular points to nan |
19 | y = x | 23 | m = pmodulo(x+90,180) |
20 | y(m==0) = tan(%pi/180*x(m==0)); | 24 | y(m==0) = %nan |
21 | if or(m==1) then | ||
22 | y(m==1 & ~z) = -1 ./ tan(%pi/180*x(m==1 & ~z)); | ||
23 | y(m==1 & z & n>=0) = %inf; | ||
24 | y(m==1 & z & n<0) = -%inf; | ||
25 | end | ||
26 | endfunction | 25 | endfunction |
26 | |||
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref index 52d820e..2144325 100644 --- a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref +++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref | |||
@@ -1,394 +1,452 @@ | |||
1 | // ============================================================================= | 1 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 3 | // Copyright (C) 2008 - INRIA - Serge Steer |
4 | // Copyright (C) 2010 - DIGITEO - Michael Baudin | ||
4 | // | 5 | // |
5 | // This file is distributed under the same license as the Scilab package. | 6 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 7 | // ============================================================================= |
7 | // <-- JVM NOT MANDATORY --> | 8 | // <-- JVM NOT MANDATORY --> |
9 | // | ||
10 | // assert_close -- | ||
11 | // Returns 1 if the two real matrices computed and expected are close, | ||
12 | // i.e. if the relative distance between computed and expected is lesser than epsilon. | ||
13 | // Arguments | ||
14 | // computed, expected : the two matrices to compare | ||
15 | // epsilon : a small number | ||
16 | // | ||
17 | function flag = assert_close ( computed, expected, epsilon ) | ||
18 | if expected==0.0 then | ||
19 | shift = norm(computed-expected); | ||
20 | else | ||
21 | shift = norm(computed-expected)/norm(expected); | ||
22 | end | ||
23 | if shift < epsilon then | ||
24 | flag = 1; | ||
25 | else | ||
26 | flag = 0; | ||
27 | end | ||
28 | if flag <> 1 then bugmes();quit;end | ||
29 | endfunction | ||
30 | // | ||
31 | // assert_equal -- | ||
32 | // Returns 1 if the two real matrices computed and expected are equal. | ||
33 | // Arguments | ||
34 | // computed, expected : the two matrices to compare | ||
35 | // epsilon : a small number | ||
36 | // | ||
37 | function flag = assert_equal ( computed , expected ) | ||
38 | if computed==expected then | ||
39 | flag = 1; | ||
40 | else | ||
41 | flag = 0; | ||
42 | end | ||
43 | if flag <> 1 then bugmes();quit;end | ||
44 | endfunction | ||
8 | // Maple code used to create reference | 45 | // Maple code used to create reference |
9 | // Digits := 40; | 46 | // Digits := 40; |
10 | // writeto("tand.ref"); interface(prettyprint = 0); | 47 | // writeto("tand.ref"); interface(prettyprint = 0); |
11 | // for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; | 48 | // for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; |
12 | // writeto(terminal); | 49 | // writeto(terminal); |
13 | ieee(2); | 50 | ieee(2); |
14 | pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab | 51 | //used to make following code runnable under Matlab |
15 | ref=[-180, 0. | 52 | pi=%pi; |
16 | -179, 0.174550649282175857651288952197e-1 | 53 | eps=%eps; |
17 | -178, 0.349207694917477305004026257737e-1 | 54 | Inf=%inf; |
18 | -177, 0.524077792830412040388058244741e-1 | 55 | NaN=%nan; |
19 | -176, 0.699268119435104136669210603231e-1 | 56 | // |
20 | -175, 0.874886635259240052220186694350e-1 | 57 | x = (-180:180)'; |
21 | -174, .105104235265676462511502380140 | 58 | // Remove 90 (index #91) and -90 (index #271), |
22 | -173, .122784560902904591134231136053 | 59 | // where the value is %nan |
23 | -172, .140540834702391446838117693433 | 60 | x([91 271]) = []; |
24 | -171, .158384440324536293838883092694 | 61 | e=[ |
25 | -170, .176326980708464973471090386869 | 62 | 0. |
26 | -169, .194380309137718484243194224977 | 63 | 0.174550649282175857651288952197e-1 |
27 | -168, .212556561670022125259591660570 | 64 | 0.349207694917477305004026257737e-1 |
28 | -167, .230868191125563111748145613474 | 65 | 0.524077792830412040388058244741e-1 |
29 | -166, .249328002843180691624039937805 | 66 | 0.699268119435104136669210603231e-1 |
30 | -165, .267949192431122706472553658494 | 67 | 0.874886635259240052220186694350e-1 |
31 | -164, .286745385758807940042758062732 | 68 | .105104235265676462511502380140 |
32 | -163, .305730681458660355734541958996 | 69 | .122784560902904591134231136053 |
33 | -162, .324919696232906326155871412215 | 70 | .140540834702391446838117693433 |
34 | -161, .344327613289665241957265839384 | 71 | .158384440324536293838883092694 |
35 | -160, .363970234266202361351047882776 | 72 | .176326980708464973471090386869 |
36 | -159, .383864035035415795971448408105 | 73 | .194380309137718484243194224977 |
37 | -158, .404026225835156811322348143579 | 74 | .212556561670022125259591660570 |
38 | -157, .424474816209604742023532062943 | 75 | .230868191125563111748145613474 |
39 | -156, .445228685308536163922367030644 | 76 | .249328002843180691624039937805 |
40 | -155, .466307658154998592830006194801 | 77 | .267949192431122706472553658494 |
41 | -154, .487732588565861422773111126616 | 78 | .286745385758807940042758062732 |
42 | -153, .509525449494428810513706911251 | 79 | .305730681458660355734541958996 |
43 | -152, .531709431661478748075915871842 | 80 | .324919696232906326155871412215 |
44 | -151, .554309051452768917820763092337 | 81 | .344327613289665241957265839384 |
45 | -150, .577350269189625764509148780503 | 82 | .363970234266202361351047882776 |
46 | -149, .600860619027560414878664426354 | 83 | .383864035035415795971448408105 |
47 | -148, .624869351909327509780510827950 | 84 | .404026225835156811322348143579 |
48 | -147, .649407593197510576982062911310 | 85 | .424474816209604742023532062943 |
49 | -146, .674508516842426632142460861996 | 86 | .445228685308536163922367030644 |
50 | -145, .700207538209709779458522719443 | 87 | .466307658154998592830006194801 |
51 | -144, .726542528005360885895466757481 | 88 | .487732588565861422773111126616 |
52 | -143, .753554050102794157073956448623 | 89 | .509525449494428810513706911251 |
53 | -142, .781285626506717397062949971961 | 90 | .531709431661478748075915871842 |
54 | -141, .809784033195007148036991374238 | 91 | .554309051452768917820763092337 |
55 | -140, .839099631177280011763127298122 | 92 | .577350269189625764509148780503 |
56 | -139, .869286737816226662200095638705 | 93 | .600860619027560414878664426354 |
57 | -138, .900404044297839945120477203883 | 94 | .624869351909327509780510827950 |
58 | -137, .932515086137661705612185627428 | 95 | .649407593197510576982062911310 |
59 | -136, .965688774807074045958027299699 | 96 | .674508516842426632142460861996 |
60 | -135, 1. | 97 | .700207538209709779458522719443 |
61 | -134, 1.03553031379056950695883255125 | 98 | .726542528005360885895466757481 |
62 | -133, 1.07236871002468253294602774807 | 99 | .753554050102794157073956448623 |
63 | -132, 1.11061251482919287014348196417 | 100 | .781285626506717397062949971961 |
64 | -131, 1.15036840722100955587633102557 | 101 | .809784033195007148036991374238 |
65 | -130, 1.19175359259420995870530807186 | 102 | .839099631177280011763127298122 |
66 | -129, 1.23489715653505139855617469537 | 103 | .869286737816226662200095638705 |
67 | -128, 1.27994163219307878031102984757 | 104 | .900404044297839945120477203883 |
68 | -127, 1.32704482162041003715947257408 | 105 | .932515086137661705612185627428 |
69 | -126, 1.37638192047117353820720958191 | 106 | .965688774807074045958027299699 |
70 | -125, 1.42814800674211450216061848500 | 107 | 1. |
71 | -124, 1.48256096851274025478715714915 | 108 | 1.03553031379056950695883255125 |
72 | -123, 1.53986496381458290482679697261 | 109 | 1.07236871002468253294602774807 |
73 | -122, 1.60033452904105035532673308117 | 110 | 1.11061251482919287014348196417 |
74 | -121, 1.66427948235051791103049617004 | 111 | 1.15036840722100955587633102557 |
75 | -120, 1.73205080756887729352744634151 | 112 | 1.19175359259420995870530807186 |
76 | -119, 1.80404775527142393738178474825 | 113 | 1.23489715653505139855617469537 |
77 | -118, 1.88072646534633201236083759582 | 114 | 1.27994163219307878031102984757 |
78 | -117, 1.96261050550515058230464042622 | 115 | 1.32704482162041003715947257408 |
79 | -116, 2.05030384157929621689901107053 | 116 | 1.37638192047117353820720958191 |
80 | -115, 2.14450692050955861635626079106 | 117 | 1.42814800674211450216061848500 |
81 | -114, 2.24603677390421605416332143840 | 118 | 1.48256096851274025478715714915 |
82 | -113, 2.35585236582375283393958666236 | 119 | 1.53986496381458290482679697261 |
83 | -112, 2.47508685341629582524001324606 | 120 | 1.60033452904105035532673308117 |
84 | -111, 2.60508906469380153625841233646 | 121 | 1.66427948235051791103049617004 |
85 | -110, 2.74747741945462227876166402648 | 122 | 1.73205080756887729352744634151 |
86 | -109, 2.90421087767582280257932553456 | 123 | 1.80404775527142393738178474825 |
87 | -108, 3.07768353717525340257029057602 | 124 | 1.88072646534633201236083759582 |
88 | -107, 3.27085261848414086530885625734 | 125 | 1.96261050550515058230464042622 |
89 | -106, 3.48741444384090865069622422508 | 126 | 2.05030384157929621689901107053 |
90 | -105, 3.73205080756887729352744634156 | 127 | 2.14450692050955861635626079106 |
91 | -104, 4.01078093353584471634571512944 | 128 | 2.24603677390421605416332143840 |
92 | -103, 4.33147587428415554554616775463 | 129 | 2.35585236582375283393958666236 |
93 | -102, 4.70463010947845423358623453738 | 130 | 2.47508685341629582524001324606 |
94 | -101, 5.14455401597031013472322071724 | 131 | 2.60508906469380153625841233646 |
95 | -100, 5.67128181961770953099441843983 | 132 | 2.74747741945462227876166402648 |
96 | -99, 6.31375151467504309897946424494 | 133 | 2.90421087767582280257932553456 |
97 | -98, 7.11536972238420874823056614360 | 134 | 3.07768353717525340257029057602 |
98 | -97, 8.14434642797459402382566139528 | 135 | 3.27085261848414086530885625734 |
99 | -96, 9.51436445422258492968397145491 | 136 | 3.48741444384090865069622422508 |
100 | -95, 11.4300523027613430672108555485 | 137 | 3.73205080756887729352744634156 |
101 | -94, 14.3006662567119279101280533475 | 138 | 4.01078093353584471634571512944 |
102 | -93, 19.0811366877282110634067487325 | 139 | 4.33147587428415554554616775463 |
103 | -92, 28.6362532829156035507565093210 | 140 | 4.70463010947845423358623453738 |
104 | -91, 57.2899616307594246872781475211 | 141 | 5.14455401597031013472322071724 |
105 | -89, -57.2899616307594246872781475211 | 142 | 5.67128181961770953099441843983 |
106 | -88, -28.6362532829156035507565093210 | 143 | 6.31375151467504309897946424494 |
107 | -87, -19.0811366877282110634067487325 | 144 | 7.11536972238420874823056614360 |
108 | -86, -14.3006662567119279101280533475 | 145 | 8.14434642797459402382566139528 |
109 | -85, -11.4300523027613430672108555485 | 146 | 9.51436445422258492968397145491 |
110 | -84, -9.51436445422258492968397145491 | 147 | 11.4300523027613430672108555485 |
111 | -83, -8.14434642797459402382566139528 | 148 | 14.3006662567119279101280533475 |
112 | -82, -7.11536972238420874823056614360 | 149 | 19.0811366877282110634067487325 |
113 | -81, -6.31375151467504309897946424494 | 150 | 28.6362532829156035507565093210 |
114 | -80, -5.67128181961770953099441843983 | 151 | 57.2899616307594246872781475211 |
115 | -79, -5.14455401597031013472322071724 | 152 | -57.2899616307594246872781475211 |
116 | -78, -4.70463010947845423358623453738 | 153 | -28.6362532829156035507565093210 |
117 | -77, -4.33147587428415554554616775463 | 154 | -19.0811366877282110634067487325 |
118 | -76, -4.01078093353584471634571512944 | 155 | -14.3006662567119279101280533475 |
119 | -75, -3.73205080756887729352744634156 | 156 | -11.4300523027613430672108555485 |
120 | -74, -3.48741444384090865069622422508 | 157 | -9.51436445422258492968397145491 |
121 | -73, -3.27085261848414086530885625734 | 158 | -8.14434642797459402382566139528 |
122 | -72, -3.07768353717525340257029057602 | 159 | -7.11536972238420874823056614360 |
123 | -71, -2.90421087767582280257932553456 | 160 | -6.31375151467504309897946424494 |
124 | -70, -2.74747741945462227876166402648 | 161 | -5.67128181961770953099441843983 |
125 | -69, -2.60508906469380153625841233646 | 162 | -5.14455401597031013472322071724 |
126 | -68, -2.47508685341629582524001324606 | 163 | -4.70463010947845423358623453738 |
127 | -67, -2.35585236582375283393958666236 | 164 | -4.33147587428415554554616775463 |
128 | -66, -2.24603677390421605416332143840 | 165 | -4.01078093353584471634571512944 |
129 | -65, -2.14450692050955861635626079106 | 166 | -3.73205080756887729352744634156 |
130 | -64, -2.05030384157929621689901107053 | 167 | -3.48741444384090865069622422508 |
131 | -63, -1.96261050550515058230464042622 | 168 | -3.27085261848414086530885625734 |
132 | -62, -1.88072646534633201236083759582 | 169 | -3.07768353717525340257029057602 |
133 | -61, -1.80404775527142393738178474825 | 170 | -2.90421087767582280257932553456 |
134 | -60, -1.73205080756887729352744634151 | 171 | -2.74747741945462227876166402648 |
135 | -59, -1.66427948235051791103049617004 | 172 | -2.60508906469380153625841233646 |
136 | -58, -1.60033452904105035532673308117 | 173 | -2.47508685341629582524001324606 |
137 | -57, -1.53986496381458290482679697261 | 174 | -2.35585236582375283393958666236 |
138 | -56, -1.48256096851274025478715714915 | 175 | -2.24603677390421605416332143840 |
139 | -55, -1.42814800674211450216061848500 | 176 | -2.14450692050955861635626079106 |
140 | -54, -1.37638192047117353820720958191 | 177 | -2.05030384157929621689901107053 |
141 | -53, -1.32704482162041003715947257408 | 178 | -1.96261050550515058230464042622 |
142 | -52, -1.27994163219307878031102984757 | 179 | -1.88072646534633201236083759582 |
143 | -51, -1.23489715653505139855617469537 | 180 | -1.80404775527142393738178474825 |
144 | -50, -1.19175359259420995870530807186 | 181 | -1.73205080756887729352744634151 |
145 | -49, -1.15036840722100955587633102557 | 182 | -1.66427948235051791103049617004 |
146 | -48, -1.11061251482919287014348196417 | 183 | -1.60033452904105035532673308117 |
147 | -47, -1.07236871002468253294602774807 | 184 | -1.53986496381458290482679697261 |
148 | -46, -1.03553031379056950695883255125 | 185 | -1.48256096851274025478715714915 |
149 | -45, -1. | 186 | -1.42814800674211450216061848500 |
150 | -44, -.965688774807074045958027299699 | 187 | -1.37638192047117353820720958191 |
151 | -43, -.932515086137661705612185627428 | 188 | -1.32704482162041003715947257408 |
152 | -42, -.900404044297839945120477203883 | 189 | -1.27994163219307878031102984757 |
153 | -41, -.869286737816226662200095638705 | 190 | -1.23489715653505139855617469537 |
154 | -40, -.839099631177280011763127298122 | 191 | -1.19175359259420995870530807186 |
155 | -39, -.809784033195007148036991374238 | 192 | -1.15036840722100955587633102557 |
156 | -38, -.781285626506717397062949971961 | 193 | -1.11061251482919287014348196417 |
157 | -37, -.753554050102794157073956448623 | 194 | -1.07236871002468253294602774807 |
158 | -36, -.726542528005360885895466757481 | 195 | -1.03553031379056950695883255125 |
159 | -35, -.700207538209709779458522719443 | 196 | -1. |
160 | -34, -.674508516842426632142460861996 | 197 | -.965688774807074045958027299699 |
161 | -33, -.649407593197510576982062911310 | 198 | -.932515086137661705612185627428 |
162 | -32, -.624869351909327509780510827950 | 199 | -.900404044297839945120477203883 |
163 | -31, -.600860619027560414878664426354 | 200 | -.869286737816226662200095638705 |
164 | -30, -.577350269189625764509148780503 | 201 | -.839099631177280011763127298122 |
165 | -29, -.554309051452768917820763092337 | 202 | -.809784033195007148036991374238 |
166 | -28, -.531709431661478748075915871842 | 203 | -.781285626506717397062949971961 |
167 | -27, -.509525449494428810513706911251 | 204 | -.753554050102794157073956448623 |
168 | -26, -.487732588565861422773111126616 | 205 | -.726542528005360885895466757481 |
169 | -25, -.466307658154998592830006194801 | 206 | -.700207538209709779458522719443 |
170 | -24, -.445228685308536163922367030644 | 207 | -.674508516842426632142460861996 |
171 | -23, -.424474816209604742023532062943 | 208 | -.649407593197510576982062911310 |
172 | -22, -.404026225835156811322348143579 | 209 | -.624869351909327509780510827950 |
173 | -21, -.383864035035415795971448408105 | 210 | -.600860619027560414878664426354 |
174 | -20, -.363970234266202361351047882776 | 211 | -.577350269189625764509148780503 |
175 | -19, -.344327613289665241957265839384 | 212 | -.554309051452768917820763092337 |
176 | -18, -.324919696232906326155871412215 | 213 | -.531709431661478748075915871842 |
177 | -17, -.305730681458660355734541958996 | 214 | -.509525449494428810513706911251 |
178 | -16, -.286745385758807940042758062732 | 215 | -.487732588565861422773111126616 |
179 | -15, -.267949192431122706472553658494 | 216 | -.466307658154998592830006194801 |
180 | -14, -.249328002843180691624039937805 | 217 | -.445228685308536163922367030644 |
181 | -13, -.230868191125563111748145613474 | 218 | -.424474816209604742023532062943 |
182 | -12, -.212556561670022125259591660570 | 219 | -.404026225835156811322348143579 |
183 | -11, -.194380309137718484243194224977 | 220 | -.383864035035415795971448408105 |
184 | -10, -.176326980708464973471090386869 | 221 | -.363970234266202361351047882776 |
185 | -9, -.158384440324536293838883092694 | 222 | -.344327613289665241957265839384 |
186 | -8, -.140540834702391446838117693433 | 223 | -.324919696232906326155871412215 |
187 | -7, -.122784560902904591134231136053 | 224 | -.305730681458660355734541958996 |
188 | -6, -.105104235265676462511502380140 | 225 | -.286745385758807940042758062732 |
189 | -5, -0.874886635259240052220186694350e-1 | 226 | -.267949192431122706472553658494 |
190 | -4, -0.699268119435104136669210603231e-1 | 227 | -.249328002843180691624039937805 |
191 | -3, -0.524077792830412040388058244741e-1 | 228 | -.230868191125563111748145613474 |
192 | -2, -0.349207694917477305004026257737e-1 | 229 | -.212556561670022125259591660570 |
193 | -1, -0.174550649282175857651288952197e-1 | 230 | -.194380309137718484243194224977 |
194 | 0, 0. | 231 | -.176326980708464973471090386869 |
195 | 1, 0.174550649282175857651288952197e-1 | 232 | -.158384440324536293838883092694 |
196 | 2, 0.349207694917477305004026257737e-1 | 233 | -.140540834702391446838117693433 |
197 | 3, 0.524077792830412040388058244741e-1 | 234 | -.122784560902904591134231136053 |
198 | 4, 0.699268119435104136669210603231e-1 | 235 | -.105104235265676462511502380140 |
199 | 5, 0.874886635259240052220186694350e-1 | 236 | -0.874886635259240052220186694350e-1 |
200 | 6, .105104235265676462511502380140 | 237 | -0.699268119435104136669210603231e-1 |
201 | 7, .122784560902904591134231136053 | 238 | -0.524077792830412040388058244741e-1 |
202 | 8, .140540834702391446838117693433 | 239 | -0.349207694917477305004026257737e-1 |
203 | 9, .158384440324536293838883092694 | 240 | -0.174550649282175857651288952197e-1 |
204 | 10, .176326980708464973471090386869 | 241 | 0. |
205 | 11, .194380309137718484243194224977 | 242 | 0.174550649282175857651288952197e-1 |
206 | 12, .212556561670022125259591660570 | 243 | 0.349207694917477305004026257737e-1 |
207 | 13, .230868191125563111748145613474 | 244 | 0.524077792830412040388058244741e-1 |
208 | 14, .249328002843180691624039937805 | 245 | 0.699268119435104136669210603231e-1 |
209 | 15, .267949192431122706472553658494 | 246 | 0.874886635259240052220186694350e-1 |
210 | 16, .286745385758807940042758062732 | 247 | .105104235265676462511502380140 |
211 | 17, .305730681458660355734541958996 | 248 | .122784560902904591134231136053 |
212 | 18, .324919696232906326155871412215 | 249 | .140540834702391446838117693433 |
213 | 19, .344327613289665241957265839384 | 250 | .158384440324536293838883092694 |
214 | 20, .363970234266202361351047882776 | 251 | .176326980708464973471090386869 |
215 | 21, .383864035035415795971448408105 | 252 | .194380309137718484243194224977 |
216 | 22, .404026225835156811322348143579 | 253 | .212556561670022125259591660570 |
217 | 23, .424474816209604742023532062943 | 254 | .230868191125563111748145613474 |
218 | 24, .445228685308536163922367030644 | 255 | .249328002843180691624039937805 |
219 | 25, .466307658154998592830006194801 | 256 | .267949192431122706472553658494 |
220 | 26, .487732588565861422773111126616 | 257 | .286745385758807940042758062732 |
221 | 27, .509525449494428810513706911251 | 258 | .305730681458660355734541958996 |
222 | 28, .531709431661478748075915871842 | 259 | .324919696232906326155871412215 |
223 | 29, .554309051452768917820763092337 | 260 | .344327613289665241957265839384 |
224 | 30, .577350269189625764509148780503 | 261 | .363970234266202361351047882776 |
225 | 31, .600860619027560414878664426354 | 262 | .383864035035415795971448408105 |
226 | 32, .624869351909327509780510827950 | 263 | .404026225835156811322348143579 |
227 | 33, .649407593197510576982062911310 | 264 | .424474816209604742023532062943 |
228 | 34, .674508516842426632142460861996 | 265 | .445228685308536163922367030644 |
229 | 35, .700207538209709779458522719443 | 266 | .466307658154998592830006194801 |
230 | 36, .726542528005360885895466757481 | 267 | .487732588565861422773111126616 |
231 | 37, .753554050102794157073956448623 | 268 | .509525449494428810513706911251 |
232 | 38, .781285626506717397062949971961 | 269 | .531709431661478748075915871842 |
233 | 39, .809784033195007148036991374238 | 270 | .554309051452768917820763092337 |
234 | 40, .839099631177280011763127298122 | 271 | .577350269189625764509148780503 |
235 | 41, .869286737816226662200095638705 | 272 | .600860619027560414878664426354 |
236 | 42, .900404044297839945120477203883 | 273 | .624869351909327509780510827950 |
237 | 43, .932515086137661705612185627428 | 274 | .649407593197510576982062911310 |
238 | 44, .965688774807074045958027299699 | 275 | .674508516842426632142460861996 |
239 | 45, 1. | 276 | .700207538209709779458522719443 |
240 | 46, 1.03553031379056950695883255125 | 277 | .726542528005360885895466757481 |
241 | 47, 1.07236871002468253294602774807 | 278 | .753554050102794157073956448623 |
242 | 48, 1.11061251482919287014348196417 | 279 | .781285626506717397062949971961 |
243 | 49, 1.15036840722100955587633102557 | 280 | .809784033195007148036991374238 |
244 | 50, 1.19175359259420995870530807186 | 281 | .839099631177280011763127298122 |
245 | 51, 1.23489715653505139855617469537 | 282 | .869286737816226662200095638705 |
246 | 52, 1.27994163219307878031102984757 | 283 | .900404044297839945120477203883 |
247 | 53, 1.32704482162041003715947257408 | 284 | .932515086137661705612185627428 |
248 | 54, 1.37638192047117353820720958191 | 285 | .965688774807074045958027299699 |
249 | 55, 1.42814800674211450216061848500 | 286 | 1. |
250 | 56, 1.48256096851274025478715714915 | 287 | 1.03553031379056950695883255125 |
251 | 57, 1.53986496381458290482679697261 | 288 | 1.07236871002468253294602774807 |
252 | 58, 1.60033452904105035532673308117 | 289 | 1.11061251482919287014348196417 |
253 | 59, 1.66427948235051791103049617004 | 290 | 1.15036840722100955587633102557 |
254 | 60, 1.73205080756887729352744634151 | 291 | 1.19175359259420995870530807186 |
255 | 61, 1.80404775527142393738178474825 | 292 | 1.23489715653505139855617469537 |
256 | 62, 1.88072646534633201236083759582 | 293 | 1.27994163219307878031102984757 |
257 | 63, 1.96261050550515058230464042622 | 294 | 1.32704482162041003715947257408 |
258 | 64, 2.05030384157929621689901107053 | 295 | 1.37638192047117353820720958191 |
259 | 65, 2.14450692050955861635626079106 | 296 | 1.42814800674211450216061848500 |
260 | 66, 2.24603677390421605416332143840 | 297 | 1.48256096851274025478715714915 |
261 | 67, 2.35585236582375283393958666236 | 298 | 1.53986496381458290482679697261 |
262 | 68, 2.47508685341629582524001324606 | 299 | 1.60033452904105035532673308117 |
263 | 69, 2.60508906469380153625841233646 | 300 | 1.66427948235051791103049617004 |
264 | 70, 2.74747741945462227876166402648 | 301 | 1.73205080756887729352744634151 |
265 | 71, 2.90421087767582280257932553456 | 302 | 1.80404775527142393738178474825 |
266 | 72, 3.07768353717525340257029057602 | 303 | 1.88072646534633201236083759582 |
267 | 73, 3.27085261848414086530885625734 | 304 | 1.96261050550515058230464042622 |
268 | 74, 3.48741444384090865069622422508 | 305 | 2.05030384157929621689901107053 |
269 | 75, 3.73205080756887729352744634156 | 306 | 2.14450692050955861635626079106 |
270 | 76, 4.01078093353584471634571512944 | 307 | 2.24603677390421605416332143840 |
271 | 77, 4.33147587428415554554616775463 | 308 | 2.35585236582375283393958666236 |
272 | 78, 4.70463010947845423358623453738 | 309 | 2.47508685341629582524001324606 |
273 | 79, 5.14455401597031013472322071724 | 310 | 2.60508906469380153625841233646 |
274 | 80, 5.67128181961770953099441843983 | 311 | 2.74747741945462227876166402648 |
275 | 81, 6.31375151467504309897946424494 | 312 | 2.90421087767582280257932553456 |
276 | 82, 7.11536972238420874823056614360 | 313 | 3.07768353717525340257029057602 |
277 | 83, 8.14434642797459402382566139528 | 314 | 3.27085261848414086530885625734 |
278 | 84, 9.51436445422258492968397145491 | 315 | 3.48741444384090865069622422508 |
279 | 85, 11.4300523027613430672108555485 | 316 | 3.73205080756887729352744634156 |
280 | 86, 14.3006662567119279101280533475 | 317 | 4.01078093353584471634571512944 |
281 | 87, 19.0811366877282110634067487325 | 318 | 4.33147587428415554554616775463 |
282 | 88, 28.6362532829156035507565093210 | 319 | 4.70463010947845423358623453738 |
283 | 89, 57.2899616307594246872781475211 | 320 | 5.14455401597031013472322071724 |
284 | 91, -57.2899616307594246872781475211 | 321 | 5.67128181961770953099441843983 |
285 | 92, -28.6362532829156035507565093210 | 322 | 6.31375151467504309897946424494 |
286 | 93, -19.0811366877282110634067487325 | 323 | 7.11536972238420874823056614360 |
287 | 94, -14.3006662567119279101280533475 | 324 | 8.14434642797459402382566139528 |
288 | 95, -11.4300523027613430672108555485 | 325 | 9.51436445422258492968397145491 |
289 | 96, -9.51436445422258492968397145491 | 326 | 11.4300523027613430672108555485 |
290 | 97, -8.14434642797459402382566139528 | 327 | 14.3006662567119279101280533475 |
291 | 98, -7.11536972238420874823056614360 | 328 | 19.0811366877282110634067487325 |
292 | 99, -6.31375151467504309897946424494 | 329 | 28.6362532829156035507565093210 |
293 | 100, -5.67128181961770953099441843983 | 330 | 57.2899616307594246872781475211 |
294 | 101, -5.14455401597031013472322071724 | 331 | -57.2899616307594246872781475211 |
295 | 102, -4.70463010947845423358623453738 | 332 | -28.6362532829156035507565093210 |
296 | 103, -4.33147587428415554554616775463 | 333 | -19.0811366877282110634067487325 |
297 | 104, -4.01078093353584471634571512944 | 334 | -14.3006662567119279101280533475 |
298 | 105, -3.73205080756887729352744634156 | 335 | -11.4300523027613430672108555485 |
299 | 106, -3.48741444384090865069622422508 | 336 | -9.51436445422258492968397145491 |
300 | 107, -3.27085261848414086530885625734 | 337 | -8.14434642797459402382566139528 |
301 | 108, -3.07768353717525340257029057602 | 338 | -7.11536972238420874823056614360 |
302 | 109, -2.90421087767582280257932553456 | 339 | -6.31375151467504309897946424494 |
303 | 110, -2.74747741945462227876166402648 | 340 | -5.67128181961770953099441843983 |
304 | 111, -2.60508906469380153625841233646 | 341 | -5.14455401597031013472322071724 |
305 | 112, -2.47508685341629582524001324606 | 342 | -4.70463010947845423358623453738 |
306 | 113, -2.35585236582375283393958666236 | 343 | -4.33147587428415554554616775463 |
307 | 114, -2.24603677390421605416332143840 | 344 | -4.01078093353584471634571512944 |
308 | 115, -2.14450692050955861635626079106 | 345 | -3.73205080756887729352744634156 |
309 | 116, -2.05030384157929621689901107053 | 346 | -3.48741444384090865069622422508 |
310 | 117, -1.96261050550515058230464042622 | 347 | -3.27085261848414086530885625734 |
311 | 118, -1.88072646534633201236083759582 | 348 | -3.07768353717525340257029057602 |
312 | 119, -1.80404775527142393738178474825 | 349 | -2.90421087767582280257932553456 |
313 | 120, -1.73205080756887729352744634151 | 350 | -2.74747741945462227876166402648 |
314 | 121, -1.66427948235051791103049617004 | 351 | -2.60508906469380153625841233646 |
315 | 122, -1.60033452904105035532673308117 | 352 | -2.47508685341629582524001324606 |
316 | 123, -1.53986496381458290482679697261 | 353 | -2.35585236582375283393958666236 |
317 | 124, -1.48256096851274025478715714915 | 354 | -2.24603677390421605416332143840 |
318 | 125, -1.42814800674211450216061848500 | 355 | -2.14450692050955861635626079106 |
319 | 126, -1.37638192047117353820720958191 | 356 | -2.05030384157929621689901107053 |
320 | 127, -1.32704482162041003715947257408 | 357 | -1.96261050550515058230464042622 |
321 | 128, -1.27994163219307878031102984757 | 358 | -1.88072646534633201236083759582 |
322 | 129, -1.23489715653505139855617469537 | 359 | -1.80404775527142393738178474825 |
323 | 130, -1.19175359259420995870530807186 | 360 | -1.73205080756887729352744634151 |
324 | 131, -1.15036840722100955587633102557 | 361 | -1.66427948235051791103049617004 |
325 | 132, -1.11061251482919287014348196417 | 362 | -1.60033452904105035532673308117 |
326 | 133, -1.07236871002468253294602774807 | 363 | -1.53986496381458290482679697261 |
327 | 134, -1.03553031379056950695883255125 | 364 | -1.48256096851274025478715714915 |
328 | 135, -1. | 365 | -1.42814800674211450216061848500 |
329 | 136, -.965688774807074045958027299699 | 366 | -1.37638192047117353820720958191 |
330 | 137, -.932515086137661705612185627428 | 367 | -1.32704482162041003715947257408 |
331 | 138, -.900404044297839945120477203883 | 368 | -1.27994163219307878031102984757 |
332 | 139, -.869286737816226662200095638705 | 369 | -1.23489715653505139855617469537 |
333 | 140, -.839099631177280011763127298122 | 370 | -1.19175359259420995870530807186 |
334 | 141, -.809784033195007148036991374238 | 371 | -1.15036840722100955587633102557 |
335 | 142, -.781285626506717397062949971961 | 372 | -1.11061251482919287014348196417 |
336 | 143, -.753554050102794157073956448623 | 373 | -1.07236871002468253294602774807 |
337 | 144, -.726542528005360885895466757481 | 374 | -1.03553031379056950695883255125 |
338 | 145, -.700207538209709779458522719443 | 375 | -1. |
339 | 146, -.674508516842426632142460861996 | 376 | -.965688774807074045958027299699 |
340 | 147, -.649407593197510576982062911310 | 377 | -.932515086137661705612185627428 |
341 | 148, -.624869351909327509780510827950 | 378 | -.900404044297839945120477203883 |
342 | 149, -.600860619027560414878664426354 | 379 | -.869286737816226662200095638705 |
343 | 150, -.577350269189625764509148780503 | 380 | -.839099631177280011763127298122 |
344 | 151, -.554309051452768917820763092337 | 381 | -.809784033195007148036991374238 |
345 | 152, -.531709431661478748075915871842 | 382 | -.781285626506717397062949971961 |
346 | 153, -.509525449494428810513706911251 | 383 | -.753554050102794157073956448623 |
347 | 154, -.487732588565861422773111126616 | 384 | -.726542528005360885895466757481 |
348 | 155, -.466307658154998592830006194801 | 385 | -.700207538209709779458522719443 |
349 | 156, -.445228685308536163922367030644 | 386 | -.674508516842426632142460861996 |
350 | 157, -.424474816209604742023532062943 | 387 | -.649407593197510576982062911310 |
351 | 158, -.404026225835156811322348143579 | 388 | -.624869351909327509780510827950 |
352 | 159, -.383864035035415795971448408105 | 389 | -.600860619027560414878664426354 |
353 | 160, -.363970234266202361351047882776 | 390 | -.577350269189625764509148780503 |
354 | 161, -.344327613289665241957265839384 | 391 | -.554309051452768917820763092337 |
355 | 162, -.324919696232906326155871412215 | 392 | -.531709431661478748075915871842 |
356 | 163, -.305730681458660355734541958996 | 393 | -.509525449494428810513706911251 |
357 | 164, -.286745385758807940042758062732 | 394 | -.487732588565861422773111126616 |
358 | 165, -.267949192431122706472553658494 | 395 | -.466307658154998592830006194801 |
359 | 166, -.249328002843180691624039937805 | 396 | -.445228685308536163922367030644 |
360 | 167, -.230868191125563111748145613474 | 397 | -.424474816209604742023532062943 |
361 | 168, -.212556561670022125259591660570 | 398 | -.404026225835156811322348143579 |
362 | 169, -.194380309137718484243194224977 | 399 | -.383864035035415795971448408105 |
363 | 170, -.176326980708464973471090386869 | 400 | -.363970234266202361351047882776 |
364 | 171, -.158384440324536293838883092694 | 401 | -.344327613289665241957265839384 |
365 | 172, -.140540834702391446838117693433 | 402 | -.324919696232906326155871412215 |
366 | 173, -.122784560902904591134231136053 | 403 | -.305730681458660355734541958996 |
367 | 174, -.105104235265676462511502380140 | 404 | -.286745385758807940042758062732 |
368 | 175, -0.874886635259240052220186694350e-1 | 405 | -.267949192431122706472553658494 |
369 | 176, -0.699268119435104136669210603231e-1 | 406 | -.249328002843180691624039937805 |
370 | 177, -0.524077792830412040388058244741e-1 | 407 | -.230868191125563111748145613474 |
371 | 178, -0.349207694917477305004026257737e-1 | 408 | -.212556561670022125259591660570 |
372 | 179, -0.174550649282175857651288952197e-1 | 409 | -.194380309137718484243194224977 |
373 | 180, 0. | 410 | -.176326980708464973471090386869 |
411 | -.158384440324536293838883092694 | ||
412 | -.140540834702391446838117693433 | ||
413 | -.122784560902904591134231136053 | ||
414 | -.105104235265676462511502380140 | ||
415 | -0.874886635259240052220186694350e-1 | ||
416 | -0.699268119435104136669210603231e-1 | ||
417 | -0.524077792830412040388058244741e-1 | ||
418 | -0.349207694917477305004026257737e-1 | ||
419 | -0.174550649282175857651288952197e-1 | ||
420 | 0. | ||
374 | ]; | 421 | ]; |
375 | x=ref(:,1);e=max(abs((ref(:,2)-tand(x)))); | 422 | c = tand(x); |
376 | if e>40*eps then bugmes();quit;end | 423 | assert_close ( c , e , 40 * %eps ); |
377 | x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x)))); | 424 | // Turn a lot around the circle |
378 | if e>40*eps then bugmes();quit;end | 425 | x1 = x + 2^6*360; |
379 | x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x)))); | 426 | c = tand(x1); |
380 | if e>40*eps then bugmes();quit;end | 427 | assert_close ( c , e , 40 * %eps ); |
381 | if tand(0)<>0 then bugmes();quit;end | 428 | // Turn a lot around the circle, the other side |
382 | if tand(360)<>0 then bugmes();quit;end | 429 | x2 = x - 2^6*360; |
383 | if tand(-360)<>0 then bugmes();quit;end | 430 | c = tand(x2); |
384 | if tand(90)<>%inf then bugmes();quit;end | 431 | assert_close ( c , e , 40 * %eps ); |
385 | if tand(-90)<>-%inf then bugmes();quit;end | 432 | assert_equal ( tand(0) , 0 ); |
386 | if tand(180)<>0 then bugmes();quit;end | 433 | assert_equal ( tand(360) , 0 ); |
387 | if tand(-180)<>0 then bugmes();quit;end | 434 | assert_equal ( tand(-360) , 0 ); |
388 | if tand(270)<>%inf then bugmes();quit;end | 435 | assert_equal ( tand(180) , 0 ); |
389 | if tand(-270)<>-%inf then bugmes();quit;end | 436 | assert_equal ( tand(-180) , 0 ); |
390 | if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then bugmes();quit;end | 437 | assert_close ( tand(30) , 1/sqrt(3) , %eps ); |
391 | if ~isnan(tand(-Inf)) then bugmes();quit;end | 438 | assert_close ( tand(45) , 1 , 2 * %eps ); |
392 | if ~isnan(tand(Inf)) then bugmes();quit;end | 439 | assert_close ( tand(60) , sqrt(3) , 2*%eps ); |
393 | if ~isnan(tand(NaN)) then bugmes();quit;end | 440 | assert_equal ( isnan(tand(90)) , %t ); |
394 | if tand([])<>[] then bugmes();quit;end | 441 | assert_equal ( isnan(tand(-90)) , %t ); |
442 | assert_equal ( isnan(tand(270)) , %t ); | ||
443 | assert_equal ( isnan(tand(-270)) , %t ); | ||
444 | assert_equal ( isnan(tand(-%inf)) , %t ); | ||
445 | assert_equal ( isnan(tand(%inf)) , %t ); | ||
446 | assert_equal ( isnan(tand(%nan)) , %t ); | ||
447 | assert_equal ( tand([]) , [] ); | ||
448 | ieee(0) | ||
449 | assert_equal ( tand(0) , 0 ); | ||
450 | assert_close ( tand(30) , 1/sqrt(3) , %eps ); | ||
451 | assert_close ( tand(45) , 1 , 2 * %eps ); | ||
452 | assert_close ( tand(60) , sqrt(3) , 2*%eps ); | ||
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst index 30f01af..1b88df3 100644 --- a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst +++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst | |||
@@ -1,402 +1,467 @@ | |||
1 | // ============================================================================= | 1 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 3 | // Copyright (C) 2008 - INRIA - Serge Steer |
4 | // Copyright (C) 2010 - DIGITEO - Michael Baudin | ||
4 | // | 5 | // |
5 | // This file is distributed under the same license as the Scilab package. | 6 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 7 | // ============================================================================= |
7 | 8 | ||
8 | // <-- JVM NOT MANDATORY --> | 9 | // <-- JVM NOT MANDATORY --> |
9 | 10 | ||
11 | // | ||
12 | // assert_close -- | ||
13 | // Returns 1 if the two real matrices computed and expected are close, | ||
14 | // i.e. if the relative distance between computed and expected is lesser than epsilon. | ||
15 | // Arguments | ||
16 | // computed, expected : the two matrices to compare | ||
17 | // epsilon : a small number | ||
18 | // | ||
19 | function flag = assert_close ( computed, expected, epsilon ) | ||
20 | if expected==0.0 then | ||
21 | shift = norm(computed-expected); | ||
22 | else | ||
23 | shift = norm(computed-expected)/norm(expected); | ||
24 | end | ||
25 | if shift < epsilon then | ||
26 | flag = 1; | ||
27 | else | ||
28 | flag = 0; | ||
29 | end | ||
30 | if flag <> 1 then pause,end | ||
31 | endfunction | ||
32 | // | ||
33 | // assert_equal -- | ||
34 | // Returns 1 if the two real matrices computed and expected are equal. | ||
35 | // Arguments | ||
36 | // computed, expected : the two matrices to compare | ||
37 | // epsilon : a small number | ||
38 | // | ||
39 | function flag = assert_equal ( computed , expected ) | ||
40 | if computed==expected then | ||
41 | flag = 1; | ||
42 | else | ||
43 | flag = 0; | ||
44 | end | ||
45 | if flag <> 1 then pause,end | ||
46 | endfunction | ||
47 | |||
10 | // Maple code used to create reference | 48 | // Maple code used to create reference |
11 | // Digits := 40; | 49 | // Digits := 40; |
12 | // writeto("tand.ref"); interface(prettyprint = 0); | 50 | // writeto("tand.ref"); interface(prettyprint = 0); |
13 | // for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; | 51 | // for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; |
14 | // writeto(terminal); | 52 | // writeto(terminal); |
15 | ieee(2); | 53 | ieee(2); |
16 | pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab | 54 | //used to make following code runnable under Matlab |
55 | pi=%pi; | ||
56 | eps=%eps; | ||
57 | Inf=%inf; | ||
58 | NaN=%nan; | ||
59 | |||
60 | // | ||
61 | x = (-180:180)'; | ||
62 | // Remove 90 (index #91) and -90 (index #271), | ||
63 | // where the value is %nan | ||
64 | x([91 271]) = []; | ||
17 | 65 | ||
18 | ref=[-180, 0. | 66 | e=[ |
19 | -179, 0.174550649282175857651288952197e-1 | 67 | 0. |
20 | -178, 0.349207694917477305004026257737e-1 | 68 | 0.174550649282175857651288952197e-1 |
21 | -177, 0.524077792830412040388058244741e-1 | 69 | 0.349207694917477305004026257737e-1 |
22 | -176, 0.699268119435104136669210603231e-1 | 70 | 0.524077792830412040388058244741e-1 |
23 | -175, 0.874886635259240052220186694350e-1 | 71 | 0.699268119435104136669210603231e-1 |
24 | -174, .105104235265676462511502380140 | 72 | 0.874886635259240052220186694350e-1 |
25 | -173, .122784560902904591134231136053 | 73 | .105104235265676462511502380140 |
26 | -172, .140540834702391446838117693433 | 74 | .122784560902904591134231136053 |
27 | -171, .158384440324536293838883092694 | 75 | .140540834702391446838117693433 |
28 | -170, .176326980708464973471090386869 | 76 | .158384440324536293838883092694 |
29 | -169, .194380309137718484243194224977 | 77 | .176326980708464973471090386869 |
30 | -168, .212556561670022125259591660570 | 78 | .194380309137718484243194224977 |
31 | -167, .230868191125563111748145613474 | 79 | .212556561670022125259591660570 |
32 | -166, .249328002843180691624039937805 | 80 | .230868191125563111748145613474 |
33 | -165, .267949192431122706472553658494 | 81 | .249328002843180691624039937805 |
34 | -164, .286745385758807940042758062732 | 82 | .267949192431122706472553658494 |
35 | -163, .305730681458660355734541958996 | 83 | .286745385758807940042758062732 |
36 | -162, .324919696232906326155871412215 | 84 | .305730681458660355734541958996 |
37 | -161, .344327613289665241957265839384 | 85 | .324919696232906326155871412215 |
38 | -160, .363970234266202361351047882776 | 86 | .344327613289665241957265839384 |
39 | -159, .383864035035415795971448408105 | 87 | .363970234266202361351047882776 |
40 | -158, .404026225835156811322348143579 | 88 | .383864035035415795971448408105 |
41 | -157, .424474816209604742023532062943 | 89 | .404026225835156811322348143579 |
42 | -156, .445228685308536163922367030644 | 90 | .424474816209604742023532062943 |
43 | -155, .466307658154998592830006194801 | 91 | .445228685308536163922367030644 |
44 | -154, .487732588565861422773111126616 | 92 | .466307658154998592830006194801 |
45 | -153, .509525449494428810513706911251 | 93 | .487732588565861422773111126616 |
46 | -152, .531709431661478748075915871842 | 94 | .509525449494428810513706911251 |
47 | -151, .554309051452768917820763092337 | 95 | .531709431661478748075915871842 |
48 | -150, .577350269189625764509148780503 | 96 | .554309051452768917820763092337 |
49 | -149, .600860619027560414878664426354 | 97 | .577350269189625764509148780503 |
50 | -148, .624869351909327509780510827950 | 98 | .600860619027560414878664426354 |
51 | -147, .649407593197510576982062911310 | 99 | .624869351909327509780510827950 |
52 | -146, .674508516842426632142460861996 | 100 | .649407593197510576982062911310 |
53 | -145, .700207538209709779458522719443 | 101 | .674508516842426632142460861996 |
54 | -144, .726542528005360885895466757481 | 102 | .700207538209709779458522719443 |
55 | -143, .753554050102794157073956448623 | 103 | .726542528005360885895466757481 |
56 | -142, .781285626506717397062949971961 | 104 | .753554050102794157073956448623 |
57 | -141, .809784033195007148036991374238 | 105 | .781285626506717397062949971961 |
58 | -140, .839099631177280011763127298122 | 106 | .809784033195007148036991374238 |
59 | -139, .869286737816226662200095638705 | 107 | .839099631177280011763127298122 |
60 | -138, .900404044297839945120477203883 | 108 | .869286737816226662200095638705 |
61 | -137, .932515086137661705612185627428 | 109 | .900404044297839945120477203883 |
62 | -136, .965688774807074045958027299699 | 110 | .932515086137661705612185627428 |
63 | -135, 1. | 111 | .965688774807074045958027299699 |
64 | -134, 1.03553031379056950695883255125 | 112 | 1. |
65 | -133, 1.07236871002468253294602774807 | 113 | 1.03553031379056950695883255125 |
66 | -132, 1.11061251482919287014348196417 | 114 | 1.07236871002468253294602774807 |
67 | -131, 1.15036840722100955587633102557 | 115 | 1.11061251482919287014348196417 |
68 | -130, 1.19175359259420995870530807186 | 116 | 1.15036840722100955587633102557 |
69 | -129, 1.23489715653505139855617469537 | 117 | 1.19175359259420995870530807186 |
70 | -128, 1.27994163219307878031102984757 | 118 | 1.23489715653505139855617469537 |
71 | -127, 1.32704482162041003715947257408 | 119 | 1.27994163219307878031102984757 |
72 | -126, 1.37638192047117353820720958191 | 120 | 1.32704482162041003715947257408 |
73 | -125, 1.42814800674211450216061848500 | 121 | 1.37638192047117353820720958191 |
74 | -124, 1.48256096851274025478715714915 | 122 | 1.42814800674211450216061848500 |
75 | -123, 1.53986496381458290482679697261 | 123 | 1.48256096851274025478715714915 |
76 | -122, 1.60033452904105035532673308117 | 124 | 1.53986496381458290482679697261 |
77 | -121, 1.66427948235051791103049617004 | 125 | 1.60033452904105035532673308117 |
78 | -120, 1.73205080756887729352744634151 | 126 | 1.66427948235051791103049617004 |
79 | -119, 1.80404775527142393738178474825 | 127 | 1.73205080756887729352744634151 |
80 | -118, 1.88072646534633201236083759582 | 128 | 1.80404775527142393738178474825 |
81 | -117, 1.96261050550515058230464042622 | 129 | 1.88072646534633201236083759582 |
82 | -116, 2.05030384157929621689901107053 | 130 | 1.96261050550515058230464042622 |
83 | -115, 2.14450692050955861635626079106 | 131 | 2.05030384157929621689901107053 |
84 | -114, 2.24603677390421605416332143840 | 132 | 2.14450692050955861635626079106 |
85 | -113, 2.35585236582375283393958666236 | 133 | 2.24603677390421605416332143840 |
86 | -112, 2.47508685341629582524001324606 | 134 | 2.35585236582375283393958666236 |
87 | -111, 2.60508906469380153625841233646 | 135 | 2.47508685341629582524001324606 |
88 | -110, 2.74747741945462227876166402648 | 136 | 2.60508906469380153625841233646 |
89 | -109, 2.90421087767582280257932553456 | 137 | 2.74747741945462227876166402648 |
90 | -108, 3.07768353717525340257029057602 | 138 | 2.90421087767582280257932553456 |
91 | -107, 3.27085261848414086530885625734 | 139 | 3.07768353717525340257029057602 |
92 | -106, 3.48741444384090865069622422508 | 140 | 3.27085261848414086530885625734 |
93 | -105, 3.73205080756887729352744634156 | 141 | 3.48741444384090865069622422508 |
94 | -104, 4.01078093353584471634571512944 | 142 | 3.73205080756887729352744634156 |
95 | -103, 4.33147587428415554554616775463 | 143 | 4.01078093353584471634571512944 |
96 | -102, 4.70463010947845423358623453738 | 144 | 4.33147587428415554554616775463 |
97 | -101, 5.14455401597031013472322071724 | 145 | 4.70463010947845423358623453738 |
98 | -100, 5.67128181961770953099441843983 | 146 | 5.14455401597031013472322071724 |
99 | -99, 6.31375151467504309897946424494 | 147 | 5.67128181961770953099441843983 |
100 | -98, 7.11536972238420874823056614360 | 148 | 6.31375151467504309897946424494 |
101 | -97, 8.14434642797459402382566139528 | 149 | 7.11536972238420874823056614360 |
102 | -96, 9.51436445422258492968397145491 | 150 | 8.14434642797459402382566139528 |
103 | -95, 11.4300523027613430672108555485 | 151 | 9.51436445422258492968397145491 |
104 | -94, 14.3006662567119279101280533475 | 152 | 11.4300523027613430672108555485 |
105 | -93, 19.0811366877282110634067487325 | 153 | 14.3006662567119279101280533475 |
106 | -92, 28.6362532829156035507565093210 | 154 | 19.0811366877282110634067487325 |
107 | -91, 57.2899616307594246872781475211 | 155 | 28.6362532829156035507565093210 |
108 | -89, -57.2899616307594246872781475211 | 156 | 57.2899616307594246872781475211 |
109 | -88, -28.6362532829156035507565093210 | 157 | -57.2899616307594246872781475211 |
110 | -87, -19.0811366877282110634067487325 | 158 | -28.6362532829156035507565093210 |
111 | -86, -14.3006662567119279101280533475 | 159 | -19.0811366877282110634067487325 |
112 | -85, -11.4300523027613430672108555485 | 160 | -14.3006662567119279101280533475 |
113 | -84, -9.51436445422258492968397145491 | 161 | -11.4300523027613430672108555485 |
114 | -83, -8.14434642797459402382566139528 | 162 | -9.51436445422258492968397145491 |
115 | -82, -7.11536972238420874823056614360 | 163 | -8.14434642797459402382566139528 |
116 | -81, -6.31375151467504309897946424494 | 164 | -7.11536972238420874823056614360 |
117 | -80, -5.67128181961770953099441843983 | 165 | -6.31375151467504309897946424494 |
118 | -79, -5.14455401597031013472322071724 | 166 | -5.67128181961770953099441843983 |
119 | -78, -4.70463010947845423358623453738 | 167 | -5.14455401597031013472322071724 |
120 | -77, -4.33147587428415554554616775463 | 168 | -4.70463010947845423358623453738 |
121 | -76, -4.01078093353584471634571512944 | 169 | -4.33147587428415554554616775463 |
122 | -75, -3.73205080756887729352744634156 | 170 | -4.01078093353584471634571512944 |
123 | -74, -3.48741444384090865069622422508 | 171 | -3.73205080756887729352744634156 |
124 | -73, -3.27085261848414086530885625734 | 172 | -3.48741444384090865069622422508 |
125 | -72, -3.07768353717525340257029057602 | 173 | -3.27085261848414086530885625734 |
126 | -71, -2.90421087767582280257932553456 | 174 | -3.07768353717525340257029057602 |
127 | -70, -2.74747741945462227876166402648 | 175 | -2.90421087767582280257932553456 |
128 | -69, -2.60508906469380153625841233646 | 176 | -2.74747741945462227876166402648 |
129 | -68, -2.47508685341629582524001324606 | 177 | -2.60508906469380153625841233646 |
130 | -67, -2.35585236582375283393958666236 | 178 | -2.47508685341629582524001324606 |
131 | -66, -2.24603677390421605416332143840 | 179 | -2.35585236582375283393958666236 |
132 | -65, -2.14450692050955861635626079106 | 180 | -2.24603677390421605416332143840 |
133 | -64, -2.05030384157929621689901107053 | 181 | -2.14450692050955861635626079106 |
134 | -63, -1.96261050550515058230464042622 | 182 | -2.05030384157929621689901107053 |
135 | -62, -1.88072646534633201236083759582 | 183 | -1.96261050550515058230464042622 |
136 | -61, -1.80404775527142393738178474825 | 184 | -1.88072646534633201236083759582 |
137 | -60, -1.73205080756887729352744634151 | 185 | -1.80404775527142393738178474825 |
138 | -59, -1.66427948235051791103049617004 | 186 | -1.73205080756887729352744634151 |
139 | -58, -1.60033452904105035532673308117 | 187 | -1.66427948235051791103049617004 |
140 | -57, -1.53986496381458290482679697261 | 188 | -1.60033452904105035532673308117 |
141 | -56, -1.48256096851274025478715714915 | 189 | -1.53986496381458290482679697261 |
142 | -55, -1.42814800674211450216061848500 | 190 | -1.48256096851274025478715714915 |
143 | -54, -1.37638192047117353820720958191 | 191 | -1.42814800674211450216061848500 |
144 | -53, -1.32704482162041003715947257408 | 192 | -1.37638192047117353820720958191 |
145 | -52, -1.27994163219307878031102984757 | 193 | -1.32704482162041003715947257408 |
146 | -51, -1.23489715653505139855617469537 | 194 | -1.27994163219307878031102984757 |
147 | -50, -1.19175359259420995870530807186 | 195 | -1.23489715653505139855617469537 |
148 | -49, -1.15036840722100955587633102557 | 196 | -1.19175359259420995870530807186 |
149 | -48, -1.11061251482919287014348196417 | 197 | -1.15036840722100955587633102557 |
150 | -47, -1.07236871002468253294602774807 | 198 | -1.11061251482919287014348196417 |
151 | -46, -1.03553031379056950695883255125 | 199 | -1.07236871002468253294602774807 |
152 | -45, -1. | 200 | -1.03553031379056950695883255125 |
153 | -44, -.965688774807074045958027299699 | 201 | -1. |
154 | -43, -.932515086137661705612185627428 | 202 | -.965688774807074045958027299699 |
155 | -42, -.900404044297839945120477203883 | 203 | -.932515086137661705612185627428 |
156 | -41, -.869286737816226662200095638705 | 204 | -.900404044297839945120477203883 |
157 | -40, -.839099631177280011763127298122 | 205 | -.869286737816226662200095638705 |
158 | -39, -.809784033195007148036991374238 | 206 | -.839099631177280011763127298122 |
159 | -38, -.781285626506717397062949971961 | 207 | -.809784033195007148036991374238 |
160 | -37, -.753554050102794157073956448623 | 208 | -.781285626506717397062949971961 |
161 | -36, -.726542528005360885895466757481 | 209 | -.753554050102794157073956448623 |
162 | -35, -.700207538209709779458522719443 | 210 | -.726542528005360885895466757481 |
163 | -34, -.674508516842426632142460861996 | 211 | -.700207538209709779458522719443 |
164 | -33, -.649407593197510576982062911310 | 212 | -.674508516842426632142460861996 |
165 | -32, -.624869351909327509780510827950 | 213 | -.649407593197510576982062911310 |
166 | -31, -.600860619027560414878664426354 | 214 | -.624869351909327509780510827950 |
167 | -30, -.577350269189625764509148780503 | 215 | -.600860619027560414878664426354 |
168 | -29, -.554309051452768917820763092337 | 216 | -.577350269189625764509148780503 |
169 | -28, -.531709431661478748075915871842 | 217 | -.554309051452768917820763092337 |
170 | -27, -.509525449494428810513706911251 | 218 | -.531709431661478748075915871842 |
171 | -26, -.487732588565861422773111126616 | 219 | -.509525449494428810513706911251 |
172 | -25, -.466307658154998592830006194801 | 220 | -.487732588565861422773111126616 |
173 | -24, -.445228685308536163922367030644 | 221 | -.466307658154998592830006194801 |
174 | -23, -.424474816209604742023532062943 | 222 | -.445228685308536163922367030644 |
175 | -22, -.404026225835156811322348143579 | 223 | -.424474816209604742023532062943 |
176 | -21, -.383864035035415795971448408105 | 224 | -.404026225835156811322348143579 |
177 | -20, -.363970234266202361351047882776 | 225 | -.383864035035415795971448408105 |
178 | -19, -.344327613289665241957265839384 | 226 | -.363970234266202361351047882776 |
179 | -18, -.324919696232906326155871412215 | 227 | -.344327613289665241957265839384 |
180 | -17, -.305730681458660355734541958996 | 228 | -.324919696232906326155871412215 |
181 | -16, -.286745385758807940042758062732 | 229 | -.305730681458660355734541958996 |
182 | -15, -.267949192431122706472553658494 | 230 | -.286745385758807940042758062732 |
183 | -14, -.249328002843180691624039937805 | 231 | -.267949192431122706472553658494 |
184 | -13, -.230868191125563111748145613474 | 232 | -.249328002843180691624039937805 |
185 | -12, -.212556561670022125259591660570 | 233 | -.230868191125563111748145613474 |
186 | -11, -.194380309137718484243194224977 | 234 | -.212556561670022125259591660570 |
187 | -10, -.176326980708464973471090386869 | 235 | -.194380309137718484243194224977 |
188 | -9, -.158384440324536293838883092694 | 236 | -.176326980708464973471090386869 |
189 | -8, -.140540834702391446838117693433 | 237 | -.158384440324536293838883092694 |
190 | -7, -.122784560902904591134231136053 | 238 | -.140540834702391446838117693433 |
191 | -6, -.105104235265676462511502380140 | 239 | -.122784560902904591134231136053 |
192 | -5, -0.874886635259240052220186694350e-1 | 240 | -.105104235265676462511502380140 |
193 | -4, -0.699268119435104136669210603231e-1 | 241 | -0.874886635259240052220186694350e-1 |
194 | -3, -0.524077792830412040388058244741e-1 | 242 | -0.699268119435104136669210603231e-1 |
195 | -2, -0.349207694917477305004026257737e-1 | 243 | -0.524077792830412040388058244741e-1 |
196 | -1, -0.174550649282175857651288952197e-1 | 244 | -0.349207694917477305004026257737e-1 |
197 | 0, 0. | 245 | -0.174550649282175857651288952197e-1 |
198 | 1, 0.174550649282175857651288952197e-1 | 246 | 0. |
199 | 2, 0.349207694917477305004026257737e-1 | 247 | 0.174550649282175857651288952197e-1 |
200 | 3, 0.524077792830412040388058244741e-1 | 248 | 0.349207694917477305004026257737e-1 |
201 | 4, 0.699268119435104136669210603231e-1 | 249 | 0.524077792830412040388058244741e-1 |
202 | 5, 0.874886635259240052220186694350e-1 | 250 | 0.699268119435104136669210603231e-1 |
203 | 6, .105104235265676462511502380140 | 251 | 0.874886635259240052220186694350e-1 |
204 | 7, .122784560902904591134231136053 | 252 | .105104235265676462511502380140 |
205 | 8, .140540834702391446838117693433 | 253 | .122784560902904591134231136053 |
206 | 9, .158384440324536293838883092694 | 254 | .140540834702391446838117693433 |
207 | 10, .176326980708464973471090386869 | 255 | .158384440324536293838883092694 |
208 | 11, .194380309137718484243194224977 | 256 | .176326980708464973471090386869 |
209 | 12, .212556561670022125259591660570 | 257 | .194380309137718484243194224977 |
210 | 13, .230868191125563111748145613474 | 258 | .212556561670022125259591660570 |
211 | 14, .249328002843180691624039937805 | 259 | .230868191125563111748145613474 |
212 | 15, .267949192431122706472553658494 | 260 | .249328002843180691624039937805 |
213 | 16, .286745385758807940042758062732 | 261 | .267949192431122706472553658494 |
214 | 17, .305730681458660355734541958996 | 262 | .286745385758807940042758062732 |
215 | 18, .324919696232906326155871412215 | 263 | .305730681458660355734541958996 |
216 | 19, .344327613289665241957265839384 | 264 | .324919696232906326155871412215 |
217 | 20, .363970234266202361351047882776 | 265 | .344327613289665241957265839384 |
218 | 21, .383864035035415795971448408105 | 266 | .363970234266202361351047882776 |
219 | 22, .404026225835156811322348143579 | 267 | .383864035035415795971448408105 |
220 | 23, .424474816209604742023532062943 | 268 | .404026225835156811322348143579 |
221 | 24, .445228685308536163922367030644 | 269 | .424474816209604742023532062943 |
222 | 25, .466307658154998592830006194801 | 270 | .445228685308536163922367030644 |
223 | 26, .487732588565861422773111126616 | 271 | .466307658154998592830006194801 |
224 | 27, .509525449494428810513706911251 | 272 | .487732588565861422773111126616 |
225 | 28, .531709431661478748075915871842 | 273 | .509525449494428810513706911251 |
226 | 29, .554309051452768917820763092337 | 274 | .531709431661478748075915871842 |
227 | 30, .577350269189625764509148780503 | 275 | .554309051452768917820763092337 |
228 | 31, .600860619027560414878664426354 | 276 | .577350269189625764509148780503 |
229 | 32, .624869351909327509780510827950 | 277 | .600860619027560414878664426354 |
230 | 33, .649407593197510576982062911310 | 278 | .624869351909327509780510827950 |
231 | 34, .674508516842426632142460861996 | 279 | .649407593197510576982062911310 |
232 | 35, .700207538209709779458522719443 | 280 | .674508516842426632142460861996 |
233 | 36, .726542528005360885895466757481 | 281 | .700207538209709779458522719443 |
234 | 37, .753554050102794157073956448623 | 282 | .726542528005360885895466757481 |
235 | 38, .781285626506717397062949971961 | 283 | .753554050102794157073956448623 |
236 | 39, .809784033195007148036991374238 | 284 | .781285626506717397062949971961 |
237 | 40, .839099631177280011763127298122 | 285 | .809784033195007148036991374238 |
238 | 41, .869286737816226662200095638705 | 286 | .839099631177280011763127298122 |
239 | 42, .900404044297839945120477203883 | 287 | .869286737816226662200095638705 |
240 | 43, .932515086137661705612185627428 | 288 | .900404044297839945120477203883 |
241 | 44, .965688774807074045958027299699 | 289 | .932515086137661705612185627428 |
242 | 45, 1. | 290 | .965688774807074045958027299699 |
243 | 46, 1.03553031379056950695883255125 | 291 | 1. |
244 | 47, 1.07236871002468253294602774807 | 292 | 1.03553031379056950695883255125 |
245 | 48, 1.11061251482919287014348196417 | 293 | 1.07236871002468253294602774807 |
246 | 49, 1.15036840722100955587633102557 | 294 | 1.11061251482919287014348196417 |
247 | 50, 1.19175359259420995870530807186 | 295 | 1.15036840722100955587633102557 |
248 | 51, 1.23489715653505139855617469537 | 296 | 1.19175359259420995870530807186 |
249 | 52, 1.27994163219307878031102984757 | 297 | 1.23489715653505139855617469537 |
250 | 53, 1.32704482162041003715947257408 | 298 | 1.27994163219307878031102984757 |
251 | 54, 1.37638192047117353820720958191 | 299 | 1.32704482162041003715947257408 |
252 | 55, 1.42814800674211450216061848500 | 300 | 1.37638192047117353820720958191 |
253 | 56, 1.48256096851274025478715714915 | 301 | 1.42814800674211450216061848500 |
254 | 57, 1.53986496381458290482679697261 | 302 | 1.48256096851274025478715714915 |
255 | 58, 1.60033452904105035532673308117 | 303 | 1.53986496381458290482679697261 |
256 | 59, 1.66427948235051791103049617004 | 304 | 1.60033452904105035532673308117 |
257 | 60, 1.73205080756887729352744634151 | 305 | 1.66427948235051791103049617004 |
258 | 61, 1.80404775527142393738178474825 | 306 | 1.73205080756887729352744634151 |
259 | 62, 1.88072646534633201236083759582 | 307 | 1.80404775527142393738178474825 |
260 | 63, 1.96261050550515058230464042622 | 308 | 1.88072646534633201236083759582 |
261 | 64, 2.05030384157929621689901107053 | 309 | 1.96261050550515058230464042622 |
262 | 65, 2.14450692050955861635626079106 | 310 | 2.05030384157929621689901107053 |
263 | 66, 2.24603677390421605416332143840 | 311 | 2.14450692050955861635626079106 |
264 | 67, 2.35585236582375283393958666236 | 312 | 2.24603677390421605416332143840 |
265 | 68, 2.47508685341629582524001324606 | 313 | 2.35585236582375283393958666236 |
266 | 69, 2.60508906469380153625841233646 | 314 | 2.47508685341629582524001324606 |
267 | 70, 2.74747741945462227876166402648 | 315 | 2.60508906469380153625841233646 |
268 | 71, 2.90421087767582280257932553456 | 316 | 2.74747741945462227876166402648 |
269 | 72, 3.07768353717525340257029057602 | 317 | 2.90421087767582280257932553456 |
270 | 73, 3.27085261848414086530885625734 | 318 | 3.07768353717525340257029057602 |
271 | 74, 3.48741444384090865069622422508 | 319 | 3.27085261848414086530885625734 |
272 | 75, 3.73205080756887729352744634156 | 320 | 3.48741444384090865069622422508 |
273 | 76, 4.01078093353584471634571512944 | 321 | 3.73205080756887729352744634156 |
274 | 77, 4.33147587428415554554616775463 | 322 | 4.01078093353584471634571512944 |
275 | 78, 4.70463010947845423358623453738 | 323 | 4.33147587428415554554616775463 |
276 | 79, 5.14455401597031013472322071724 | 324 | 4.70463010947845423358623453738 |
277 | 80, 5.67128181961770953099441843983 | 325 | 5.14455401597031013472322071724 |
278 | 81, 6.31375151467504309897946424494 | 326 | 5.67128181961770953099441843983 |
279 | 82, 7.11536972238420874823056614360 | 327 | 6.31375151467504309897946424494 |
280 | 83, 8.14434642797459402382566139528 | 328 | 7.11536972238420874823056614360 |
281 | 84, 9.51436445422258492968397145491 | 329 | 8.14434642797459402382566139528 |
282 | 85, 11.4300523027613430672108555485 | 330 | 9.51436445422258492968397145491 |
283 | 86, 14.3006662567119279101280533475 | 331 | 11.4300523027613430672108555485 |
284 | 87, 19.0811366877282110634067487325 | 332 | 14.3006662567119279101280533475 |
285 | 88, 28.6362532829156035507565093210 | 333 | 19.0811366877282110634067487325 |
286 | 89, 57.2899616307594246872781475211 | 334 | 28.6362532829156035507565093210 |
287 | 91, -57.2899616307594246872781475211 | 335 | 57.2899616307594246872781475211 |
288 | 92, -28.6362532829156035507565093210 | 336 | -57.2899616307594246872781475211 |
289 | 93, -19.0811366877282110634067487325 | 337 | -28.6362532829156035507565093210 |
290 | 94, -14.3006662567119279101280533475 | 338 | -19.0811366877282110634067487325 |
291 | 95, -11.4300523027613430672108555485 | 339 | -14.3006662567119279101280533475 |
292 | 96, -9.51436445422258492968397145491 | 340 | -11.4300523027613430672108555485 |
293 | 97, -8.14434642797459402382566139528 | 341 | -9.51436445422258492968397145491 |
294 | 98, -7.11536972238420874823056614360 | 342 | -8.14434642797459402382566139528 |
295 | 99, -6.31375151467504309897946424494 | 343 | -7.11536972238420874823056614360 |
296 | 100, -5.67128181961770953099441843983 | 344 | -6.31375151467504309897946424494 |
297 | 101, -5.14455401597031013472322071724 | 345 | -5.67128181961770953099441843983 |
298 | 102, -4.70463010947845423358623453738 | 346 | -5.14455401597031013472322071724 |
299 | 103, -4.33147587428415554554616775463 | 347 | -4.70463010947845423358623453738 |
300 | 104, -4.01078093353584471634571512944 | 348 | -4.33147587428415554554616775463 |
301 | 105, -3.73205080756887729352744634156 | 349 | -4.01078093353584471634571512944 |
302 | 106, -3.48741444384090865069622422508 | 350 | -3.73205080756887729352744634156 |
303 | 107, -3.27085261848414086530885625734 | 351 | -3.48741444384090865069622422508 |
304 | 108, -3.07768353717525340257029057602 | 352 | -3.27085261848414086530885625734 |
305 | 109, -2.90421087767582280257932553456 | 353 | -3.07768353717525340257029057602 |
306 | 110, -2.74747741945462227876166402648 | 354 | -2.90421087767582280257932553456 |
307 | 111, -2.60508906469380153625841233646 | 355 | -2.74747741945462227876166402648 |
308 | 112, -2.47508685341629582524001324606 | 356 | -2.60508906469380153625841233646 |
309 | 113, -2.35585236582375283393958666236 | 357 | -2.47508685341629582524001324606 |
310 | 114, -2.24603677390421605416332143840 | 358 | -2.35585236582375283393958666236 |
311 | 115, -2.14450692050955861635626079106 | 359 | -2.24603677390421605416332143840 |
312 | 116, -2.05030384157929621689901107053 | 360 | -2.14450692050955861635626079106 |
313 | 117, -1.96261050550515058230464042622 | 361 | -2.05030384157929621689901107053 |
314 | 118, -1.88072646534633201236083759582 | 362 | -1.96261050550515058230464042622 |
315 | 119, -1.80404775527142393738178474825 | 363 | -1.88072646534633201236083759582 |
316 | 120, -1.73205080756887729352744634151 | 364 | -1.80404775527142393738178474825 |
317 | 121, -1.66427948235051791103049617004 | 365 | -1.73205080756887729352744634151 |
318 | 122, -1.60033452904105035532673308117 | 366 | -1.66427948235051791103049617004 |
319 | 123, -1.53986496381458290482679697261 | 367 | -1.60033452904105035532673308117 |
320 | 124, -1.48256096851274025478715714915 | 368 | -1.53986496381458290482679697261 |
321 | 125, -1.42814800674211450216061848500 | 369 | -1.48256096851274025478715714915 |
322 | 126, -1.37638192047117353820720958191 | 370 | -1.42814800674211450216061848500 |
323 | 127, -1.32704482162041003715947257408 | 371 | -1.37638192047117353820720958191 |
324 | 128, -1.27994163219307878031102984757 | 372 | -1.32704482162041003715947257408 |
325 | 129, -1.23489715653505139855617469537 | 373 | -1.27994163219307878031102984757 |
326 | 130, -1.19175359259420995870530807186 | 374 | -1.23489715653505139855617469537 |
327 | 131, -1.15036840722100955587633102557 | 375 | -1.19175359259420995870530807186 |
328 | 132, -1.11061251482919287014348196417 | 376 | -1.15036840722100955587633102557 |
329 | 133, -1.07236871002468253294602774807 | 377 | -1.11061251482919287014348196417 |
330 | 134, -1.03553031379056950695883255125 | 378 | -1.07236871002468253294602774807 |
331 | 135, -1. | 379 | -1.03553031379056950695883255125 |
332 | 136, -.965688774807074045958027299699 | 380 | -1. |
333 | 137, -.932515086137661705612185627428 | 381 | -.965688774807074045958027299699 |
334 | 138, -.900404044297839945120477203883 | 382 | -.932515086137661705612185627428 |
335 | 139, -.869286737816226662200095638705 | 383 | -.900404044297839945120477203883 |
336 | 140, -.839099631177280011763127298122 | 384 | -.869286737816226662200095638705 |
337 | 141, -.809784033195007148036991374238 | 385 | -.839099631177280011763127298122 |
338 | 142, -.781285626506717397062949971961 | 386 | -.809784033195007148036991374238 |
339 | 143, -.753554050102794157073956448623 | 387 | -.781285626506717397062949971961 |
340 | 144, -.726542528005360885895466757481 | 388 | -.753554050102794157073956448623 |
341 | 145, -.700207538209709779458522719443 | 389 | -.726542528005360885895466757481 |
342 | 146, -.674508516842426632142460861996 | 390 | -.700207538209709779458522719443 |
343 | 147, -.649407593197510576982062911310 | 391 | -.674508516842426632142460861996 |
344 | 148, -.624869351909327509780510827950 | 392 | -.649407593197510576982062911310 |
345 | 149, -.600860619027560414878664426354 | 393 | -.624869351909327509780510827950 |
346 | 150, -.577350269189625764509148780503 | 394 | -.600860619027560414878664426354 |
347 | 151, -.554309051452768917820763092337 | 395 | -.577350269189625764509148780503 |
348 | 152, -.531709431661478748075915871842 | 396 | -.554309051452768917820763092337 |
349 | 153, -.509525449494428810513706911251 | 397 | -.531709431661478748075915871842 |
350 | 154, -.487732588565861422773111126616 | 398 | -.509525449494428810513706911251 |
351 | 155, -.466307658154998592830006194801 | 399 | -.487732588565861422773111126616 |
352 | 156, -.445228685308536163922367030644 | 400 | -.466307658154998592830006194801 |
353 | 157, -.424474816209604742023532062943 | 401 | -.445228685308536163922367030644 |
354 | 158, -.404026225835156811322348143579 | 402 | -.424474816209604742023532062943 |
355 | 159, -.383864035035415795971448408105 | 403 | -.404026225835156811322348143579 |
356 | 160, -.363970234266202361351047882776 | 404 | -.383864035035415795971448408105 |
357 | 161, -.344327613289665241957265839384 | 405 | -.363970234266202361351047882776 |
358 | 162, -.324919696232906326155871412215 | 406 | -.344327613289665241957265839384 |
359 | 163, -.305730681458660355734541958996 | 407 | -.324919696232906326155871412215 |
360 | 164, -.286745385758807940042758062732 | 408 | -.305730681458660355734541958996 |
361 | 165, -.267949192431122706472553658494 | 409 | -.286745385758807940042758062732 |
362 | 166, -.249328002843180691624039937805 | 410 | -.267949192431122706472553658494 |
363 | 167, -.230868191125563111748145613474 | 411 | -.249328002843180691624039937805 |
364 | 168, -.212556561670022125259591660570 | 412 | -.230868191125563111748145613474 |
365 | 169, -.194380309137718484243194224977 | 413 | -.212556561670022125259591660570 |
366 | 170, -.176326980708464973471090386869 | 414 | -.194380309137718484243194224977 |
367 | 171, -.158384440324536293838883092694 | 415 | -.176326980708464973471090386869 |
368 | 172, -.140540834702391446838117693433 | 416 | -.158384440324536293838883092694 |
369 | 173, -.122784560902904591134231136053 | 417 | -.140540834702391446838117693433 |
370 | 174, -.105104235265676462511502380140 | 418 | -.122784560902904591134231136053 |
371 | 175, -0.874886635259240052220186694350e-1 | 419 | -.105104235265676462511502380140 |
372 | 176, -0.699268119435104136669210603231e-1 | 420 | -0.874886635259240052220186694350e-1 |
373 | 177, -0.524077792830412040388058244741e-1 | 421 | -0.699268119435104136669210603231e-1 |
374 | 178, -0.349207694917477305004026257737e-1 | 422 | -0.524077792830412040388058244741e-1 |
375 | 179, -0.174550649282175857651288952197e-1 | 423 | -0.349207694917477305004026257737e-1 |
376 | 180, 0. | 424 | -0.174550649282175857651288952197e-1 |
425 | 0. | ||
377 | ]; | 426 | ]; |
427 | c = tand(x); | ||
428 | assert_close ( c , e , 40 * %eps ); | ||
429 | |||
430 | // Turn a lot around the circle | ||
431 | x1 = x + 2^6*360; | ||
432 | c = tand(x1); | ||
433 | assert_close ( c , e , 40 * %eps ); | ||
434 | // Turn a lot around the circle, the other side | ||
435 | x2 = x - 2^6*360; | ||
436 | c = tand(x2); | ||
437 | assert_close ( c , e , 40 * %eps ); | ||
438 | |||
439 | assert_equal ( tand(0) , 0 ); | ||
440 | assert_equal ( tand(360) , 0 ); | ||
441 | assert_equal ( tand(-360) , 0 ); | ||
442 | |||
443 | assert_equal ( tand(180) , 0 ); | ||
444 | assert_equal ( tand(-180) , 0 ); | ||
445 | |||
446 | assert_close ( tand(30) , 1/sqrt(3) , %eps ); | ||
447 | assert_close ( tand(45) , 1 , 2 * %eps ); | ||
448 | assert_close ( tand(60) , sqrt(3) , 2*%eps ); | ||
449 | |||
450 | assert_equal ( isnan(tand(90)) , %t ); | ||
451 | assert_equal ( isnan(tand(-90)) , %t ); | ||
452 | assert_equal ( isnan(tand(270)) , %t ); | ||
453 | assert_equal ( isnan(tand(-270)) , %t ); | ||
378 | 454 | ||
379 | x=ref(:,1);e=max(abs((ref(:,2)-tand(x)))); | 455 | assert_equal ( isnan(tand(-%inf)) , %t ); |
380 | if e>40*eps then pause,end | 456 | assert_equal ( isnan(tand(%inf)) , %t ); |
381 | x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x)))); | 457 | assert_equal ( isnan(tand(%nan)) , %t ); |
382 | if e>40*eps then pause,end | ||
383 | 458 | ||
384 | x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x)))); | 459 | assert_equal ( tand([]) , [] ); |
385 | if e>40*eps then pause,end | ||
386 | 460 | ||
387 | if tand(0)<>0 then pause,end | 461 | ieee(0) |
388 | if tand(360)<>0 then pause,end | 462 | assert_equal ( tand(0) , 0 ); |
389 | if tand(-360)<>0 then pause,end | 463 | assert_close ( tand(30) , 1/sqrt(3) , %eps ); |
390 | if tand(90)<>%inf then pause,end | 464 | assert_close ( tand(45) , 1 , 2 * %eps ); |
391 | if tand(-90)<>-%inf then pause,end | 465 | assert_close ( tand(60) , sqrt(3) , 2*%eps ); |
392 | if tand(180)<>0 then pause,end | ||
393 | if tand(-180)<>0 then pause,end | ||
394 | if tand(270)<>%inf then pause,end | ||
395 | if tand(-270)<>-%inf then pause,end | ||
396 | if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then pause,end | ||
397 | 466 | ||
398 | if ~isnan(tand(-Inf)) then pause,end | ||
399 | if ~isnan(tand(Inf)) then pause,end | ||
400 | if ~isnan(tand(NaN)) then pause,end | ||
401 | 467 | ||
402 | if tand([])<>[] then pause,end | ||
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in index 8a10f5b..232bda6 100644 --- a/scilab/modules/fftw/Makefile.in +++ b/scilab/modules/fftw/Makefile.in | |||
@@ -261,6 +261,7 @@ LD = @LD@ | |||
261 | LDFLAGS = @LDFLAGS@ | 261 | LDFLAGS = @LDFLAGS@ |
262 | LIBICONV = @LIBICONV@ | 262 | LIBICONV = @LIBICONV@ |
263 | LIBINTL = @LIBINTL@ | 263 | LIBINTL = @LIBINTL@ |
264 | LIBM = @LIBM@ | ||
264 | LIBOBJS = @LIBOBJS@ | 265 | LIBOBJS = @LIBOBJS@ |
265 | LIBS = @LIBS@ | 266 | LIBS = @LIBS@ |
266 | LIBTOOL = @LIBTOOL@ | 267 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in index 350fb23..22ccc9f 100644 --- a/scilab/modules/fileio/Makefile.in +++ b/scilab/modules/fileio/Makefile.in | |||
@@ -291,6 +291,7 @@ LD = @LD@ | |||
291 | LDFLAGS = @LDFLAGS@ | 291 | LDFLAGS = @LDFLAGS@ |
292 | LIBICONV = @LIBICONV@ | 292 | LIBICONV = @LIBICONV@ |
293 | LIBINTL = @LIBINTL@ | 293 | LIBINTL = @LIBINTL@ |
294 | LIBM = @LIBM@ | ||
294 | LIBOBJS = @LIBOBJS@ | 295 | LIBOBJS = @LIBOBJS@ |
295 | LIBS = @LIBS@ | 296 | LIBS = @LIBS@ |
296 | LIBTOOL = @LIBTOOL@ | 297 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in index 7291e50..c2f90e6 100644 --- a/scilab/modules/functions/Makefile.in +++ b/scilab/modules/functions/Makefile.in | |||
@@ -253,6 +253,7 @@ LD = @LD@ | |||
253 | LDFLAGS = @LDFLAGS@ | 253 | LDFLAGS = @LDFLAGS@ |
254 | LIBICONV = @LIBICONV@ | 254 | LIBICONV = @LIBICONV@ |
255 | LIBINTL = @LIBINTL@ | 255 | LIBINTL = @LIBINTL@ |
256 | LIBM = @LIBM@ | ||
256 | LIBOBJS = @LIBOBJS@ | 257 | LIBOBJS = @LIBOBJS@ |
257 | LIBS = @LIBS@ | 258 | LIBS = @LIBS@ |
258 | LIBTOOL = @LIBTOOL@ | 259 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in index b260fb2..df93152 100644 --- a/scilab/modules/genetic_algorithms/Makefile.in +++ b/scilab/modules/genetic_algorithms/Makefile.in | |||
@@ -204,6 +204,7 @@ LD = @LD@ | |||
204 | LDFLAGS = @LDFLAGS@ | 204 | LDFLAGS = @LDFLAGS@ |
205 | LIBICONV = @LIBICONV@ | 205 | LIBICONV = @LIBICONV@ |
206 | LIBINTL = @LIBINTL@ | 206 | LIBINTL = @LIBINTL@ |
207 | LIBM = @LIBM@ | ||
207 | LIBOBJS = @LIBOBJS@ | 208 | LIBOBJS = @LIBOBJS@ |
208 | LIBS = @LIBS@ | 209 | LIBS = @LIBS@ |
209 | LIBTOOL = @LIBTOOL@ | 210 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in index f34ed68..14798e2 100644 --- a/scilab/modules/graphic_export/Makefile.in +++ b/scilab/modules/graphic_export/Makefile.in | |||
@@ -278,6 +278,7 @@ LD = @LD@ | |||
278 | LDFLAGS = @LDFLAGS@ | 278 | LDFLAGS = @LDFLAGS@ |
279 | LIBICONV = @LIBICONV@ | 279 | LIBICONV = @LIBICONV@ |
280 | LIBINTL = @LIBINTL@ | 280 | LIBINTL = @LIBINTL@ |
281 | LIBM = @LIBM@ | ||
281 | LIBOBJS = @LIBOBJS@ | 282 | LIBOBJS = @LIBOBJS@ |
282 | LIBS = @LIBS@ | 283 | LIBS = @LIBS@ |
283 | LIBTOOL = @LIBTOOL@ | 284 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in index 2474334..ca2e8ec 100644 --- a/scilab/modules/graphics/Makefile.in +++ b/scilab/modules/graphics/Makefile.in | |||
@@ -613,6 +613,7 @@ LD = @LD@ | |||
613 | LDFLAGS = @LDFLAGS@ | 613 | LDFLAGS = @LDFLAGS@ |
614 | LIBICONV = @LIBICONV@ | 614 | LIBICONV = @LIBICONV@ |
615 | LIBINTL = @LIBINTL@ | 615 | LIBINTL = @LIBINTL@ |
616 | LIBM = @LIBM@ | ||
616 | LIBOBJS = @LIBOBJS@ | 617 | LIBOBJS = @LIBOBJS@ |
617 | LIBS = @LIBS@ | 618 | LIBS = @LIBS@ |
618 | LIBTOOL = @LIBTOOL@ | 619 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in index ab72ed9..841338b 100644 --- a/scilab/modules/gui/Makefile.in +++ b/scilab/modules/gui/Makefile.in | |||
@@ -366,6 +366,7 @@ LD = @LD@ | |||
366 | LDFLAGS = @LDFLAGS@ | 366 | LDFLAGS = @LDFLAGS@ |
367 | LIBICONV = @LIBICONV@ | 367 | LIBICONV = @LIBICONV@ |
368 | LIBINTL = @LIBINTL@ | 368 | LIBINTL = @LIBINTL@ |
369 | LIBM = @LIBM@ | ||
369 | LIBOBJS = @LIBOBJS@ | 370 | LIBOBJS = @LIBOBJS@ |
370 | LIBS = @LIBS@ | 371 | LIBS = @LIBS@ |
371 | LIBTOOL = @LIBTOOL@ | 372 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in index babbf34..6e4cfc0 100644 --- a/scilab/modules/hdf5/Makefile.in +++ b/scilab/modules/hdf5/Makefile.in | |||
@@ -292,6 +292,7 @@ LD = @LD@ | |||
292 | LDFLAGS = @LDFLAGS@ | 292 | LDFLAGS = @LDFLAGS@ |
293 | LIBICONV = @LIBICONV@ | 293 | LIBICONV = @LIBICONV@ |
294 | LIBINTL = @LIBINTL@ | 294 | LIBINTL = @LIBINTL@ |
295 | LIBM = @LIBM@ | ||
295 | LIBOBJS = @LIBOBJS@ | 296 | LIBOBJS = @LIBOBJS@ |
296 | LIBS = @LIBS@ | 297 | LIBS = @LIBS@ |
297 | LIBTOOL = @LIBTOOL@ | 298 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in index dfda34d..2e80b76 100644 --- a/scilab/modules/helptools/Makefile.in +++ b/scilab/modules/helptools/Makefile.in | |||
@@ -266,6 +266,7 @@ LD = @LD@ | |||
266 | LDFLAGS = @LDFLAGS@ | 266 | LDFLAGS = @LDFLAGS@ |
267 | LIBICONV = @LIBICONV@ | 267 | LIBICONV = @LIBICONV@ |
268 | LIBINTL = @LIBINTL@ | 268 | LIBINTL = @LIBINTL@ |
269 | LIBM = @LIBM@ | ||
269 | LIBOBJS = @LIBOBJS@ | 270 | LIBOBJS = @LIBOBJS@ |
270 | LIBS = @LIBS@ | 271 | LIBS = @LIBS@ |
271 | LIBTOOL = @LIBTOOL@ | 272 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in index 97856f4..b581876 100644 --- a/scilab/modules/history_manager/Makefile.in +++ b/scilab/modules/history_manager/Makefile.in | |||
@@ -289,6 +289,7 @@ LD = @LD@ | |||
289 | LDFLAGS = @LDFLAGS@ | 289 | LDFLAGS = @LDFLAGS@ |
290 | LIBICONV = @LIBICONV@ | 290 | LIBICONV = @LIBICONV@ |
291 | LIBINTL = @LIBINTL@ | 291 | LIBINTL = @LIBINTL@ |
292 | LIBM = @LIBM@ | ||
292 | LIBOBJS = @LIBOBJS@ | 293 | LIBOBJS = @LIBOBJS@ |
293 | LIBS = @LIBS@ | 294 | LIBS = @LIBS@ |
294 | LIBTOOL = @LIBTOOL@ | 295 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in index 21e59bd..d05cb05 100644 --- a/scilab/modules/integer/Makefile.in +++ b/scilab/modules/integer/Makefile.in | |||
@@ -277,6 +277,7 @@ LD = @LD@ | |||
277 | LDFLAGS = @LDFLAGS@ | 277 | LDFLAGS = @LDFLAGS@ |
278 | LIBICONV = @LIBICONV@ | 278 | LIBICONV = @LIBICONV@ |
279 | LIBINTL = @LIBINTL@ | 279 | LIBINTL = @LIBINTL@ |
280 | LIBM = @LIBM@ | ||
280 | LIBOBJS = @LIBOBJS@ | 281 | LIBOBJS = @LIBOBJS@ |
281 | LIBS = @LIBS@ | 282 | LIBS = @LIBS@ |
282 | LIBTOOL = @LIBTOOL@ | 283 | LIBTOOL = @LIBTOOL@ |
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in index b2113fb..4f8aadf 100644 --- a/scilab/modules/interpolation/Makefile.in +++ b/scilab/modules/interpolation/Makefile.in | |||
@@ -259,6 +259,7 @@ LD = @LD@ | |||
259 | LDFLAGS = @LDFLAGS@ |