Merge remote branch 'origin/5.2'
Sylvestre Ledru [Mon, 15 Feb 2010 14:25:59 +0000 (15:25 +0100)]
Conflicts:
scilab/CHANGES_5.2.X
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/m4/docbook.m4
scilab/modules/graphics/graphics.iss
scilab/scilab-lib.properties.vc

13 files changed:
1  2 
scilab/CHANGES_5.2.X
scilab/configure
scilab/configure.ac
scilab/m4/docbook.m4
scilab/modules/atoms/macros/atomsInstall.sci
scilab/modules/dynamic_link/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/scilab-lib.properties.vc

@@@ -2,18 -2,7 +2,6 @@@
                  =================================================
  
  
--
- Text editor:
- ============
- * bug 5649 fixed - The Editor did not undo properly after a find/replace.
- * bug 5651 fixed - Closing find/replace box was not removing highlights.
- * bug 5650 fixed - Replace all was not working in some cases
- * bug 5707 fixed - cmd-e executed the wrong editor file.
  Internationalization:
  =====================
  
@@@ -123,14 -112,42 +111,44 @@@ Atoms
  
  * atomsSetConfig("offLine","True"/"False") automatically calls atomsSystemUpdate()
    if its value has changed.
+   
+ * Under Windows platforms, the internet connection is now based on the default 
+   browser configuration.
+ * Various bugs when installing local packages have been fixed. 
  
  * bug 6383 fixed - A message displayed by atomsRemove() (when the module to
-                    remove is loaded) wasn't correct.
+                    remove is loaded) was not correct.
  
- * bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module
-                    but didn't update it.
+ * bug 6389 fixed - Atoms GUI: "Update" button just removed the selected module
+                    but did not update it.
                     
- * bug 6518 fixed - atomsRepositoryAdd() didn't accept local repositories.
+ * bug 6518 fixed - atomsRepositoryAdd() did not accept local repositories.
+ Text rendering:
+ ===============
+ * Handles greek, cyrillic and complete unicode for latin alphabets characters 
+ when using LaTeX in the graphics and documentation (See bug #5525)
+ Example: xstring(0.5,0.5,"$\overbrace{привет\ мир} \underbrace{γειά\ κόσμο}$")
+ * \textsuperscript LateX was not supported. (See bug #6573)
+ * bug 5679 fixed - Latex texts were not displayed (replaced by a black box) if
+                    you use scilab in a terminal service session on Windows.
+ * bug 6603 fixed - Lines were too long in the help browser.
+ Text editor:
+ ============
++* bug 5649 fixed - The Editor did not undo properly after a find/replace.
++
+ * bug 5651 fixed - Closing find/replace box was not removing highlights.
+ * bug 5650 fixed - Replace all was not working in some cases
+ * bug 5707 fixed - cmd-e executed the wrong editor file.
  
  Compilation:
  ============
@@@ -9845,7 -9840,7 +9844,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 9848 "configure"
 -// #line 9843 "configure"
++// #line 9847 "configure"
  
  
  public class conftest {
@@@ -9905,7 -9900,7 +9904,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 9908 "configure"
 -// #line 9903 "configure"
++// #line 9907 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -9963,7 -9958,7 +9962,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 9966 "configure"
 -// #line 9961 "configure"
++// #line 9965 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10005 "configure"
 -// #line 10000 "configure"
++// #line 10004 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11252,7 -11247,7 +11251,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11255 "configure"
 -// #line 11250 "configure"
++// #line 11254 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11339,7 -11334,7 +11338,7 @@@ $as_echo_n "checking minimal version (1
     export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11342 "configure"
 -// #line 11337 "configure"
++// #line 11341 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -11403,7 -11398,7 +11402,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11406 "configure"
 -// #line 11401 "configure"
++// #line 11405 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11504,7 -11499,7 +11503,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11507 "configure"
 -// #line 11502 "configure"
++// #line 11506 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11605,7 -11600,7 +11604,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11608 "configure"
 -// #line 11603 "configure"
++// #line 11607 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11707,7 -11702,7 +11706,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11710 "configure"
 -// #line 11705 "configure"
++// #line 11709 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -11808,7 -11803,7 +11807,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11811 "configure"
 -// #line 11806 "configure"
++// #line 11810 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -12009,7 -12004,7 +12008,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12012 "configure"
 -// #line 12007 "configure"
++// #line 12011 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12165,7 -12160,7 +12164,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12168 "configure"
 -// #line 12163 "configure"
++// #line 12167 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12266,7 -12261,7 +12265,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12269 "configure"
 -// #line 12264 "configure"
++// #line 12268 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12368,7 -12363,7 +12367,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12371 "configure"
 -// #line 12366 "configure"
++// #line 12370 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -12469,7 -12464,7 +12468,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12472 "configure"
 -// #line 12467 "configure"
++// #line 12471 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -12572,7 -12567,7 +12571,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12575 "configure"
 -// #line 12570 "configure"
++// #line 12574 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -12675,8 -12670,8 +12674,8 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12678 "configure"
- import ncsa.hdf.hdf5lib.HDF5Constants;
 -// #line 12673 "configure"
++// #line 12677 "configure"
+ import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12777,8 -12771,8 +12775,8 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12780 "configure"
- import org.apache.commons.logging.LogFactory;
 -// #line 12774 "configure"
++// #line 12778 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12878,8 -12872,8 +12876,8 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12881 "configure"
- import org.scilab.forge.jlatexmath.TeXFormula;
 -// #line 12875 "configure"
++// #line 12879 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12955,18 -12949,33 +12953,33 @@@ $as_echo "$as_me: WARNING: Could not fi
          fi
      fi
  
-                 JLATEXMATH=$PACKAGE_JAR_FILE
+                                  BATIK=$PACKAGE_JAR_FILE
+                               fi
  
  
+                               # Commons I/O library
  
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.8.8) of jlatexmath" >&5
- $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
-    saved_ac_java_classpath=$ac_java_classpath
-    export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
+ $as_echo_n "checking commons-io... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12968 "configure"
- import org.scilab.forge.jlatexmath.TeXFormula;
 -// #line 12977 "configure"
++// #line 12981 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13002,22 -13022,143 +13026,143 @@@ $as_echo "$jar_resolved" >&6; 
          echo "configure: failed program was:" >&5
          cat conftest.java >&5
          echo "configure: CLASSPATH was $CLASSPATH" >&5
-           as_fn_error "Wrong version of jlatexmath. Expected at least 0.8.8" "$LINENO" 5
+             ac_java_classpath=$saved_ac_java_classpath
              fi
  
-    ac_java_classpath=$saved_ac_java_classpath
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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 commons-io used by Commons I/O library (looking for package org.apache.commons.io.output.CountingOutputStream)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-io used by Commons I/O library (looking for package org.apache.commons.io.output.CountingOutputStream)" >&2;}
+         else
+                 as_fn_error "Could not find or use the Java package/jar commons-io used by Commons I/O library (looking for package org.apache.commons.io.output.CountingOutputStream)" "$LINENO" 5
+         fi
+     fi
  
+                               COMMONS_IO=$PACKAGE_JAR_FILE
  
  
- $as_echo "#define WITH_GUI /**/" >>confdefs.h
+                               # XML graphics common
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking xmlgraphics-commons" >&5
+ $as_echo_n "checking xmlgraphics-commons... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13078 "configure"
++// #line 13082 "configure"
+ import org.apache.xmlgraphics.util.Service;
+ 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
+        if test ""no"" = "no"; 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
+                  cmd="$JAVA conftest"
+                  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
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
  
-               # Checkstyle (code checking)
+             ac_java_classpath=$saved_ac_java_classpath
  
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
- $as_echo_n "checking checkstyle... " >&6; }
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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 xmlgraphics-commons used by Commons graphics library (looking for package org.apache.xmlgraphics.util.Service)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar xmlgraphics-commons used by Commons graphics library (looking for package org.apache.xmlgraphics.util.Service)" >&2;}
+         else
+                 as_fn_error "Could not find or use the Java package/jar xmlgraphics-commons used by Commons graphics library (looking for package org.apache.xmlgraphics.util.Service)" "$LINENO" 5
+         fi
+     fi
+                               XMLGRAPHICS_COMMONS=$PACKAGE_JAR_FILE
+                               # Avalon Framework (PDF)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking avalon-framework" >&5
+ $as_echo_n "checking avalon-framework... " >&6; }
        PACKAGE_JAR_FILE=
        found_jar=no
        saved_ac_java_classpath=$ac_java_classpath
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13038 "configure"
- import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 -// #line 13179 "configure"
++// #line 13183 "configure"
+ import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13136,8 -13282,419 +13286,469 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13139 "configure"
- import org.apache.commons.beanutils.Converter;
 -// #line 13285 "configure"
++// #line 13289 "configure"
+ import ncsa.hdf.hdf5lib.HDF5Constants;
+ 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
+        if test ""no"" = "no"; 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
+                  cmd="$JAVA conftest"
+                  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
+     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 ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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 jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
+ $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;}
+         else
+                 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
+         fi
+     fi
+                                 JHDF5=$PACKAGE_JAR_FILE
+                               fi
+                               # Logging (flexdock dep)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5
+ $as_echo_n "checking commons-logging... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13387 "configure"
++// #line 13391 "configure"
+ import org.apache.commons.logging.LogFactory;
+ 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
+        if test ""no"" = "no"; 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
+                  cmd="$JAVA conftest"
+                  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
+     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 ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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 commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5
+ $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;}
+         else
+                 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
+         fi
+     fi
+                               COMMONS_LOGGING=$PACKAGE_JAR_FILE
 -                                # JLaTeXMath
++                              # 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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13488 "configure"
++// #line 13492 "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
+        if test ""no"" = "no"; 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
+                  cmd="$JAVA conftest"
+                  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
+     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 ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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
++                JLATEXMATH=$PACKAGE_JAR_FILE
++
++
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.8.8) of jlatexmath" >&5
++$as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
++   saved_ac_java_classpath=$ac_java_classpath
++   export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
++
++    cat << \EOF > conftest.java
++// #line 13579 "configure"
++import org.scilab.forge.jlatexmath.TeXFormula;
++
++public class conftest {
++    public static void main(String[] argv) {
++        String minVersion="0.8.8";
++                                                      if (minVersion.compareTo(TeXFormula.VERSION) > 0) {
++                                                              System.exit(-1);
++                                                              }
++
++    }
++}
++EOF
++
++    CLASSPATH=$ac_java_classpath
++    export CLASSPATH
++    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
++    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
++       if test ""yes"" = "no"; then
++           echo "yes" >&5
++                 echo "yes"
++         else
++                 cmd="$JAVA conftest"
++                 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
++                 echo "yes" >&5
++                         echo "yes"
++                      else
++                      echo "configure: failed program was:" >&5
++                              cat conftest.java >&5
++                      echo "configure: CLASSPATH was $CLASSPATH" >&5
++                        as_fn_error "Wrong version of jlatexmath. Expected at least 0.8.8" "$LINENO" 5
++                                              fi
++              fi
++    else
++        echo "configure: failed program was:" >&5
++        cat conftest.java >&5
++        echo "configure: CLASSPATH was $CLASSPATH" >&5
++          as_fn_error "Wrong version of jlatexmath. Expected at least 0.8.8" "$LINENO" 5
++            fi
++
++   ac_java_classpath=$saved_ac_java_classpath
+ $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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13595 "configure"
++// #line 13649 "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
+        if test ""no"" = "no"; 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
+                  cmd="$JAVA conftest"
+                  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
+     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 ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 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
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13696 "configure"
++// #line 13750 "configure"
+ import org.apache.commons.beanutils.Converter;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13237,7 -13794,7 +13848,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13240 "configure"
 -// #line 13797 "configure"
++// #line 13851 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -13317,411 -13874,6 +13928,411 @@@ $as_echo "$as_me: WARNING: Could not fi
                ANTLR=$PACKAGE_JAR_FILE
  
  
 +              # Test NG (java unitary test)
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
 +$as_echo_n "checking testng... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.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
 +      jars_resolved=`ls $jar 2>/dev/null`
 +      for jar_resolved in $jars_resolved; do # If several jars matches
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 13341 "configure"
++// #line 13952 "configure"
 +import org.testng.TestNG;
 +
 +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
 +       if test ""no"" = "no"; 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
 +                 cmd="$JAVA conftest"
 +                 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
 +    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 ls returns several results and the first one is OK, stop the search
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +      done
 +        # If found, no need to search in other directory
 +      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 testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&5
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +              TESTNG=$PACKAGE_JAR_FILE
 +
 +
 +              # Qdox (parses declarations and Javadoc) - dependency of TestNG
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
 +$as_echo_n "checking qdox... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.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
 +      jars_resolved=`ls $jar 2>/dev/null`
 +      for jar_resolved in $jars_resolved; do # If several jars matches
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 13442 "configure"
++// #line 14053 "configure"
 +import com.thoughtworks.qdox.tools.QDoxTester;
 +
 +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
 +       if test ""no"" = "no"; 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
 +                 cmd="$JAVA conftest"
 +                 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
 +    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 ls returns several results and the first one is OK, stop the search
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +      done
 +        # If found, no need to search in other directory
 +      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 qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +              QDOX=$PACKAGE_JAR_FILE
 +
 +
 +                # bsh (Java scripting environment) - dependency of TestNG
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
 +$as_echo_n "checking bsh... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.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
 +      jars_resolved=`ls $jar 2>/dev/null`
 +      for jar_resolved in $jars_resolved; do # If several jars matches
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 13543 "configure"
++// #line 14154 "configure"
 +import bsh.Console;
 +
 +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
 +       if test ""no"" = "no"; 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
 +                 cmd="$JAVA conftest"
 +                 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
 +    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 ls returns several results and the first one is OK, stop the search
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +      done
 +        # If found, no need to search in other directory
 +      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 bsh used by Java scripting environment (looking for package bsh.Console)" >&5
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +                BSH=$PACKAGE_JAR_FILE
 +
 +
 +                # Junit - dependency of TestNG
 +
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
 +$as_echo_n "checking junit... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.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
 +      jars_resolved=`ls $jar 2>/dev/null`
 +      for jar_resolved in $jars_resolved; do # If several jars matches
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 13644 "configure"
++// #line 14255 "configure"
 +import junit.framework.Assert;
 +
 +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
 +       if test ""no"" = "no"; 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
 +                 cmd="$JAVA conftest"
 +                 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
 +    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 ls returns several results and the first one is OK, stop the search
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +      done
 +        # If found, no need to search in other directory
 +      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 junit used by Unitary tests (looking for package junit.framework.Assert)" >&5
 +$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;}
 +        else
 +                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
 +        fi
 +    fi
 +
 +                JUNIT=$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;}
@@@ -21830,7 -21982,7 +22441,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 21833 "configure"
 -#line 21985 "configure"
++#line 22444 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -22142,7 -22294,7 +22753,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 22145 "configure"
 -#line 22297 "configure"
++#line 22756 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -22928,7 -22878,7 +23337,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 22931 "configure"
 -// #line 22881 "configure"
++// #line 23340 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -23332,7 -22979,7 +23438,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 23335 "configure"
 -// #line 22982 "configure"
++// #line 23441 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -23433,7 -23080,7 +23539,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 23436 "configure"
 -// #line 23083 "configure"
++// #line 23542 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -23516,212 -23163,8 +23622,7 @@@ $as_echo "$as_me: WARNING: Could not fi
  
  
  
-       # JLaTeXMath
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath-fop" >&5
- $as_echo_n "checking jlatexmath-fop... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-       for jar in "$jardir/jlatexmath-fop.jar" "$jardir/libjlatexmath-fop.jar" "$jardir/libjlatexmath-fop-java.jar" "$jardir/jlatexmath-fop*.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
-       jars_resolved=`ls $jar 2>/dev/null`
-       for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-     cat << \EOF > conftest.java
- // #line 23540 "configure"
- import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
- 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
-        if test ""no"" = "no"; 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
-                  cmd="$JAVA conftest"
-                  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
-     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 ls returns several results and the first one is OK, stop the search
-       if test "$found_jar" = "yes"; then
-         break
-       fi
-       done
-         # If found, no need to search in other directory
-       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-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" >&5
- $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" >&2;}
-         else
-                 as_fn_error "Could not find or use the Java package/jar jlatexmath-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" "$LINENO" 5
-         fi
-     fi
-     JLATEXMATH_FOP=$PACKAGE_JAR_FILE
-       # Avalon Framework (PDF)
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking avalon-framework" >&5
- $as_echo_n "checking avalon-framework... " >&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) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-       for jar in "$jardir/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.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
-       jars_resolved=`ls $jar 2>/dev/null`
-       for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-     cat << \EOF > conftest.java
- // #line 23641 "configure"
- import org.apache.avalon.framework.configuration.ConfigurationException;
- 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
-        if test ""no"" = "no"; 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
-                  cmd="$JAVA conftest"
-                  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
-     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 ls returns several results and the first one is OK, stop the search
-       if test "$found_jar" = "yes"; then
-         break
-       fi
-       done
-         # If found, no need to search in other directory
-       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 avalon-framework used by Common framework for Java server application (looking for package org.apache.avalon.framework.configuration.ConfigurationException)" >&5
- $as_echo "$as_me: WARNING: Could not find or use the Java package/jar avalon-framework used by Common framework for Java server application (looking for package org.apache.avalon.framework.configuration.ConfigurationException)" >&2;}
-         else
-                 as_fn_error "Could not find or use the Java package/jar avalon-framework used by Common framework for Java server application (looking for package org.apache.avalon.framework.configuration.ConfigurationException)" "$LINENO" 5
-         fi
-     fi
-       AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
  
 -
  else
      HELP_ENABLE=no
  fi
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 29912 "configure"
 -#line 29355 "configure"
++#line 29813 "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 30018 "configure"
 -#line 29461 "configure"
++#line 29919 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
@@@ -74,20 -49,8 +49,7 @@@ AC_ARG_WITH(docbook
                XML_APIS_EXT=$PACKAGE_JAR_FILE
        fi
        AC_SUBST(XML_APIS_EXT)
 -      
  
-       # JLaTeXMath
-     AC_JAVA_CHECK_PACKAGE([jlatexmath-fop],[org.scilab.forge.jlatexmath.fop.JLaTeXMathObj],[LaTex Rendering - FOP plugin])
-     JLATEXMATH_FOP=$PACKAGE_JAR_FILE
-     AC_SUBST(JLATEXMATH_FOP)
-       # Avalon Framework (PDF)
-       AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
-       AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
-       AC_SUBST(AVALON_FRAMEWORK)
-       
  AC_SUBST(DOCBOOK_ROOT)
  
  ])
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -19,18 -19,9 +19,19 @@@ jrosetta-API.jar=${thirdparty.dir}/jros
  jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar
  
  jlatexmath.jar=${thirdparty.dir}/jlatexmath-0.8.9.jar
 +jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-0.8.9.jar
 +
  checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar
  
 +testng.jar=${thirdparty.dir}/testng.jar
 +
 +qdox.jar=${thirdparty.dir}/qdox.jar
 +
 +bsh.jar=${thirdparty.dir}/bsh.jar
 +
 +junit.jar=${thirdparty.dir}/junit.jar
 +
  ; To build the export through the Java
  avalon-framework.jar=${thirdparty.dir}/avalon-framework.jar