Merge of the textrendering branch into the master
Sylvestre Ledru [Mon, 12 Oct 2009 09:12:48 +0000 (11:12 +0200)]
82 files changed:
1  2 
scilab/Makefile.in
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/metanet/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scipad/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xpad/Makefile.in
scilab/scilab-lib.properties.in

Simple merge
Simple merge
@@@ -737,9 -877,7 +737,10 @@@ JAVA_DEBUG_OPTION
  JAVA_HOME
  JAVA_JNI_LIBS
  JAVA_JNI_INCLUDE
 +ANTLR
 +COMMONS_BEANUTILS
 +CHECKSTYLE
+ JLATEXMATH
  COMMONS_LOGGING
  JHDF5
  JROSETTA_ENGINE
@@@ -9810,7 -9922,7 +9811,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 9813 "configure"
 -// #line 9925 "configure"
++// #line 9814 "configure"
  
  
  public class conftest {
@@@ -9858,7 -9970,7 +9859,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 9861 "configure"
 -// #line 9973 "configure"
++// #line 9862 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -9904,7 -10016,7 +9905,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 9907 "configure"
 -// #line 10019 "configure"
++// #line 9908 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 9934 "configure"
 -// #line 10046 "configure"
++// #line 9935 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11168,7 -11245,7 +11169,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11171 "configure"
 -// #line 11248 "configure"
++// #line 11172 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11240,7 -11317,7 +11241,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11243 "configure"
 -// #line 11320 "configure"
++// #line 11244 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11312,7 -11389,7 +11313,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11315 "configure"
 -// #line 11392 "configure"
++// #line 11316 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11385,7 -11462,7 +11386,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11388 "configure"
 -// #line 11465 "configure"
++// #line 11389 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -11457,7 -11534,7 +11458,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11460 "configure"
 -// #line 11537 "configure"
++// #line 11461 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -11529,7 -11606,7 +11530,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11532 "configure"
 -// #line 11609 "configure"
++// #line 11533 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -11601,7 -11678,7 +11602,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11604 "configure"
 -// #line 11681 "configure"
++// #line 11605 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -11674,7 -11751,7 +11675,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11677 "configure"
 -// #line 11754 "configure"
++// #line 11678 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -11746,7 -11823,7 +11747,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11749 "configure"
 -// #line 11826 "configure"
++// #line 11750 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -11818,7 -11895,7 +11819,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11821 "configure"
 -// #line 11898 "configure"
++// #line 11822 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -11891,7 -11968,7 +11892,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11894 "configure"
 -// #line 11971 "configure"
++// #line 11895 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -11964,7 -12041,7 +11965,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11967 "configure"
 -// #line 12044 "configure"
++// #line 11968 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -12016,228 -12093,83 +12017,300 @@@ $as_echo "$as_me: WARNING: Could not fi
                                COMMONS_LOGGING=$PACKAGE_JAR_FILE
  
  
+                                 # JLaTeXMath
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
+ $as_echo_n "checking jlatexmath... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       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)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
+ #     jar=`echo $jar|sed -e 's/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jar_resolved=`ls $jar 2>/dev/null`
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 12116 "configure"
++// #line 12040 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+         echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+       done
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test "" = "yes"; then
+               { $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
+ $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;}
+         else
+                 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
+         fi
+     fi
+                                 JLATEXMATH=$PACKAGE_JAR_FILE
  
  $as_echo "#define WITH_GUI /**/" >>confdefs.h
  
  
                fi
 +
 +              # Checkstyle (code checking)
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
 +$as_echo_n "checking checkstyle... " >&6; }
 +      PACKAGE_JAR_FILE=
 +      found_jar=no
 +      saved_ac_java_classpath=$ac_java_classpath
 +      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)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
 +#     jar=`echo $jar|sed -e 's/ /\\ /'`
 +#     echo "protected $jar"
 +#     jar_resolved=`ls $jar 2>/dev/null`
 +#     echo "looking for $jar_resolved"
 +# TODO check the behaviour when spaces
 +      jar_resolved=`ls $jar 2>/dev/null`
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 12045 "configure"
++// #line 12118 "configure"
 +import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
 +        echo "yes" >&5
 +
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
 +            found_jar=yes
 +            PACKAGE_JAR_FILE=$jar_resolved
 +            break
 +
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +
 +            ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +            fi
 +
 +        fi
 +      done
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +    done
 +    if test "$found_jar" = "no"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        if test ""yes"" = "yes"; then
 +              { $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
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +              CHECKSTYLE=$PACKAGE_JAR_FILE
 +
 +
 +              # Commons beanutils (dependency of checkstyle)
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
 +$as_echo_n "checking commons-beanutils... " >&6; }
 +      PACKAGE_JAR_FILE=
 +      found_jar=no
 +      saved_ac_java_classpath=$ac_java_classpath
 +      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)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
 +#     jar=`echo $jar|sed -e 's/ /\\ /'`
 +#     echo "protected $jar"
 +#     jar_resolved=`ls $jar 2>/dev/null`
 +#     echo "looking for $jar_resolved"
 +# TODO check the behaviour when spaces
 +      jar_resolved=`ls $jar 2>/dev/null`
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 12117 "configure"
++// #line 12190 "configure"
 +import org.apache.commons.beanutils.Converter;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
 +        echo "yes" >&5
 +
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
 +            found_jar=yes
 +            PACKAGE_JAR_FILE=$jar_resolved
 +            break
 +
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +
 +            ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +            fi
 +
 +        fi
 +      done
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +    done
 +    if test "$found_jar" = "no"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        if test ""yes"" = "yes"; then
 +              { $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
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +              COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
 +
 +
 +              # antlr (dependency of checkstyle)
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5
 +$as_echo_n "checking antlr... " >&6; }
 +      PACKAGE_JAR_FILE=
 +      found_jar=no
 +      saved_ac_java_classpath=$ac_java_classpath
 +      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)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
 +#     jar=`echo $jar|sed -e 's/ /\\ /'`
 +#     echo "protected $jar"
 +#     jar_resolved=`ls $jar 2>/dev/null`
 +#     echo "looking for $jar_resolved"
 +# TODO check the behaviour when spaces
 +      jar_resolved=`ls $jar 2>/dev/null`
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 12189 "configure"
++// #line 12262 "configure"
 +import antlr.TokenStreamException;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
 +        echo "yes" >&5
 +
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
 +            found_jar=yes
 +            PACKAGE_JAR_FILE=$jar_resolved
 +            break
 +
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +
 +            ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +            fi
 +
 +        fi
 +      done
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +    done
 +    if test "$found_jar" = "no"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        if test ""yes"" = "yes"; then
 +              { $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
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +              ANTLR=$PACKAGE_JAR_FILE
 +
 +
        else
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
  $as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;}
@@@ -20237,7 -20166,7 +20310,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 20240 "configure"
 -#line 20169 "configure"
++#line 20313 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -20549,7 -20478,7 +20622,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 20552 "configure"
 -#line 20481 "configure"
++#line 20625 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -21130,7 -21059,7 +21203,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21133 "configure"
 -// #line 21062 "configure"
++// #line 21206 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -21202,7 -21131,7 +21275,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21205 "configure"
 -// #line 21134 "configure"
++// #line 21278 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -21276,7 -21205,7 +21349,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21279 "configure"
 -// #line 21208 "configure"
++// #line 21352 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -21348,7 -21277,7 +21421,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21351 "configure"
 -// #line 21280 "configure"
++// #line 21424 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -21420,7 -21349,7 +21493,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21423 "configure"
 -// #line 21352 "configure"
++// #line 21496 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -21492,7 -21421,7 +21565,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21495 "configure"
 -// #line 21424 "configure"
++// #line 21568 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -21564,7 -21493,7 +21637,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21567 "configure"
 -// #line 21496 "configure"
++// #line 21640 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -21636,7 -21565,7 +21709,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21639 "configure"
 -// #line 21568 "configure"
++// #line 21712 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -21709,7 -21638,7 +21782,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21712 "configure"
 -// #line 21641 "configure"
++// #line 21785 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 27955 "configure"
 -#line 28468 "configure"
++#line 28028 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 28061 "configure"
 -#line 28564 "configure"
++#line 28134 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -17,12 -17,10 +17,14 @@@ jrosetta-API.jar=@JROSETTA_API
  
  jrosetta-engine.jar=@JROSETTA_ENGINE@
  
 -jlatexmath.jar=@JLATEXMATH@
 +checkstyle.jar=@CHECKSTYLE@
 +
 +commons-beanutils.jar=@COMMONS_BEANUTILS@
  
 -checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar
 +antlr.jar=@ANTLR@
 +
++jlatexmath.jar=@JLATEXMATH@
  library.jvm.dir=${modules.dir}/jvm/${build.jar.dir}/
  library.jvm.name=org.scilab.modules.jvm.jar