Merge remote branch 'origin/master' into MPI
Sylvestre Ledru [Wed, 3 Mar 2010 14:26:14 +0000 (15:26 +0100)]
Conflicts:
scilab/Version.incl
scilab/configure

87 files changed:
1  2 
scilab/Makefile.in
scilab/Version.incl
scilab/aclocal.m4
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.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/help/en_US/low_level_functions/string_reading_api.xml
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/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
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/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/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/xcos/Makefile.in
scilab/modules/xpad/Makefile.in

Simple merge
@@@ -1,2 -1,1 +1,1 @@@
 -SCIVERSION=Scilab-Branch-master-GIT
 +SCIVERSION=Scilab-MPI-GIT
Simple merge
@@@ -9847,7 -9869,7 +9877,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 9850 "configure"
 -// #line 9872 "configure"
++// #line 9880 "configure"
  
  
  public class conftest {
@@@ -9907,7 -9929,7 +9937,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 9910 "configure"
 -// #line 9932 "configure"
++// #line 9940 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -9965,7 -9987,7 +9995,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 9968 "configure"
 -// #line 9990 "configure"
++// #line 9998 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10007 "configure"
 -// #line 10029 "configure"
++// #line 10037 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11253,7 -11279,7 +11287,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11256 "configure"
 -// #line 11282 "configure"
++// #line 11290 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11334,7 -11366,7 +11374,7 @@@ $as_echo_n "checking minimal version (1
     export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11337 "configure"
 -// #line 11369 "configure"
++// #line 11377 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -11397,7 -11430,7 +11438,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11400 "configure"
 -// #line 11433 "configure"
++// #line 11441 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11491,7 -11531,7 +11539,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11494 "configure"
 -// #line 11534 "configure"
++// #line 11542 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11585,7 -11632,7 +11640,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11588 "configure"
 -// #line 11635 "configure"
++// #line 11643 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11680,7 -11734,7 +11742,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11683 "configure"
 -// #line 11737 "configure"
++// #line 11745 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -11774,7 -11835,7 +11843,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11777 "configure"
 -// #line 11838 "configure"
++// #line 11846 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -11968,7 -12036,7 +12044,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11971 "configure"
 -// #line 12039 "configure"
++// #line 12047 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12117,7 -12192,7 +12200,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12120 "configure"
 -// #line 12195 "configure"
++// #line 12203 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12211,7 -12293,7 +12301,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12214 "configure"
 -// #line 12296 "configure"
++// #line 12304 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12306,7 -12395,7 +12403,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12309 "configure"
 -// #line 12398 "configure"
++// #line 12406 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -12400,7 -12496,7 +12504,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12403 "configure"
 -// #line 12499 "configure"
++// #line 12507 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -12495,8 -12599,8 +12607,8 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12498 "configure"
- import ncsa.hdf.hdf5lib.HDF5Constants;
 -// #line 12602 "configure"
++// #line 12610 "configure"
+ import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12684,8 -12702,8 +12710,8 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12687 "configure"
- import org.scilab.forge.jlatexmath.TeXFormula;
 -// #line 12705 "configure"
++// #line 12713 "configure"
+ import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12784,8 -12803,8 +12811,8 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12787 "configure"
- import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 -// #line 12806 "configure"
++// #line 12814 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12878,8 -12904,8 +12912,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.apache.commons.beanutils.Converter;
 -// #line 12907 "configure"
++// #line 12915 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12972,8 -13006,8 +13014,8 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12975 "configure"
- import antlr.TokenStreamException;
 -// #line 13009 "configure"
++// #line 13017 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13027,7 -13061,1086 +13069,1086 @@@ $as_echo "$jar_resolved" >&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 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
+                               # 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 13110 "configure"
++// #line 13118 "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
+             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 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
+       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 13211 "configure"
++// #line 13219 "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
+       # XML API EXT (conversion of a SVG => PNG)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml-apis-ext" >&5
+ $as_echo_n "checking xml-apis-ext... " >&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/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.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 13312 "configure"
++// #line 13320 "configure"
+ import org.w3c.dom.svg.SVGDocument;
+ 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 xml-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar xml-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" >&2;}
+         else
+                 as_fn_error "Could not find or use the Java package/jar xml-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" "$LINENO" 5
+         fi
+     fi
+                               XML_APIS_EXT=$PACKAGE_JAR_FILE
+                               if test -z "$XML_APIS_EXT"; then
+                                       # Other other distribs (Ex: Fedora/Redhat)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml-commons-apis-ext" >&5
+ $as_echo_n "checking xml-commons-apis-ext... " >&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/xml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext-java.jar" "$jardir/xml-commons-apis-ext*.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 13413 "configure"
++// #line 13421 "configure"
+ import org.w3c.dom.svg.SVGDocument;
+ 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 xml-commons-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar xml-commons-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" >&2;}
+         else
+                 as_fn_error "Could not find or use the Java package/jar xml-commons-apis-ext used by XML Commons external code (looking for package org.w3c.dom.svg.SVGDocument)" "$LINENO" 5
+         fi
+     fi
+                                       XML_APIS_EXT=$PACKAGE_JAR_FILE
+                               fi
+                               ################ END Mandatory for graphic_export features #####
+                               ############ XCOS ############
+                               if test $HDF5_ENABLE = yes;  then
+                               # HDF5 java lib
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
+ $as_echo_n "checking jhdf5... " >&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/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.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 13520 "configure"
++// #line 13528 "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 13622 "configure"
++// #line 13630 "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
+       { $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 13723 "configure"
++// #line 13731 "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
+     { $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 13810 "configure"
++// #line 13818 "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 13880 "configure"
++// #line 13888 "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 13981 "configure"
++// #line 13989 "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
+        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 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) $(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/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
+       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 14082 "configure"
++// #line 14090 "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
+        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
@@@ -13046,6 -14159,411 +14167,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 14183 "configure"
++// #line 14191 "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 14284 "configure"
++// #line 14292 "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 14385 "configure"
++// #line 14393 "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 14486 "configure"
++// #line 14494 "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;}
@@@ -21185,7 -22657,7 +22831,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 21188 "configure"
 -#line 22660 "configure"
++#line 22834 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -21497,7 -22969,7 +23143,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 21500 "configure"
 -#line 22972 "configure"
++#line 23146 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -22268,7 -23553,7 +23727,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 22271 "configure"
 -// #line 23556 "configure"
++// #line 23730 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -22832,8 -23654,8 +23828,8 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 22835 "configure"
- import org.w3c.dom.svg.SVGDocument;
 -// #line 23657 "configure"
++// #line 23831 "configure"
+ import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
      public static void main(String[] argv) {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 29198 "configure"
 -#line 29927 "configure"
++#line 30101 "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 29304 "configure"
 -#line 30033 "configure"
++#line 30207 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -467,10 -469,9 +473,9 @@@ GUI_LIBS = $(top_builddir)/modules/gui/
        $(top_builddir)/modules/console/libsciconsole.la \
        $(top_builddir)/modules/jvm/libscijvm.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
 -      $(top_builddir)/modules/xpad/libscixpad.la $(am__append_3)
 +      $(top_builddir)/modules/xpad/libscixpad.la $(am__append_4)
  # HDF5 is here because it needs the JVM (see bug #5481)
  NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
-       $(top_builddir)/modules/renderer/libscirenderer-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
        $(top_builddir)/modules/console/libsciconsole-disable.la \
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