Merge remote-tracking branch 'origin/master' into YaSp 71/15771/1
Vincent COUVERT [Thu, 8 Jan 2015 16:13:53 +0000 (17:13 +0100)]
Conflicts:
scilab/configure
scilab/configure.ac
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in

Change-Id: I7b1bab1dee637e1aa7a7e80cf7cc7f1805b39dd3

1  2 
scilab/.gitignore
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in

Simple merge
Simple merge
@@@ -3243,8 -3127,20 +3243,20 @@@ SCI_BUILDDIR="`pwd`
  SCI_SRCDIR="$srcdir"
  SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
  
+ if test -d "$SCI_SRCDIR_FULL/usr"; then
+     WITH_DEVTOOLS=true
+     DEVTOOLS_BINDIR="$SCI_SRCDIR_FULL/usr/bin"
+     DEVTOOLS_INCDIR="$SCI_SRCDIR_FULL/usr/include"
+     DEVTOOLS_LIBDIR="$SCI_SRCDIR_FULL/usr/lib"
+ else
+     WITH_DEVTOOLS=false
+     DEVTOOLS_BINDIR=
+     DEVTOOLS_INCDIR=
+     DEVTOOLS_LIBDIR=
+ fi
 -SCILAB_VERSION_MAJOR=5
 -SCILAB_VERSION_MINOR=6
 +SCILAB_VERSION_MAJOR=6
 +SCILAB_VERSION_MINOR=0
  SCILAB_VERSION_MAINTENANCE=0
  
  
@@@ -11599,7 -11115,7 +11661,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 11602 "configure"
 -// #line 11119 "configure"
++// #line 11664 "configure"
  import java.util.regex.Pattern;
  
  
@@@ -11686,7 -11202,7 +11748,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 11689 "configure"
 -// #line 11206 "configure"
++// #line 11751 "configure"
  import java.util.regex.Pattern;
  
  import gnu.java.io.EncodingManager;
@@@ -11770,7 -11286,7 +11832,7 @@@ $as_echo_n "checking java API version..
      # The class java.nio.charset.Charset is new to 1.4
  
      cat << \EOF > conftest.java
- // #line 11773 "configure"
 -// #line 11290 "configure"
++// #line 11835 "configure"
  import java.util.regex.Pattern;
  
  import java.nio.charset.Charset;
      # The class java.lang.StringBuilder is new to 1.5
  
      cat << \EOF > conftest.java
- // #line 11838 "configure"
 -// #line 11355 "configure"
++// #line 11900 "configure"
  import java.util.regex.Pattern;
  
  import java.lang.StringBuilder;
      # The class java.util.ArrayDeque is new to 1.6
  
      cat << \EOF > conftest.java
- // #line 11903 "configure"
 -// #line 11420 "configure"
++// #line 11965 "configure"
  import java.util.regex.Pattern;
  
  import java.util.ArrayDeque;
      # The class java.nio.file.Path is new to 1.7
  
      cat << \EOF > conftest.java
- // #line 11968 "configure"
 -// #line 11485 "configure"
++// #line 12030 "configure"
  import java.util.regex.Pattern;
  
  import java.nio.file.Path;
      # The class java.util.stream.DoubleStream is new to 1.8
  
      cat << \EOF > conftest.java
- // #line 12033 "configure"
 -// #line 11550 "configure"
++// #line 12095 "configure"
  import java.util.regex.Pattern;
  
  import java.util.stream.DoubleStream;
@@@ -13411,7 -13024,7 +13570,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13414 "configure"
 -// #line 13028 "configure"
++// #line 13573 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.model.mxCell;
@@@ -13518,7 -13131,7 +13677,7 @@@ $as_echo_n "checking minimal version (2
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13521 "configure"
 -// #line 13135 "configure"
++// #line 13680 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
     else
  
      cat << \EOF > conftest.java
- // #line 13593 "configure"
 -// #line 13207 "configure"
++// #line 13752 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
@@@ -13684,7 -13297,7 +13843,7 @@@ $as_echo_n "checking scirenderer... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13687 "configure"
 -// #line 13301 "configure"
++// #line 13846 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13791,7 -13404,7 +13950,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13794 "configure"
 -// #line 13408 "configure"
++// #line 13953 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
     else
  
      cat << \EOF > conftest.java
- // #line 13866 "configure"
 -// #line 13480 "configure"
++// #line 14025 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13962,7 -13575,7 +14121,7 @@@ $as_echo_n "checking flexdock... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13965 "configure"
 -// #line 13579 "configure"
++// #line 14124 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.docking.DockingManager;
@@@ -14069,7 -13682,7 +14228,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14072 "configure"
 -// #line 13686 "configure"
++// #line 14231 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
     else
  
      cat << \EOF > conftest.java
- // #line 14144 "configure"
 -// #line 13758 "configure"
++// #line 14303 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
@@@ -14232,7 -13845,7 +14391,7 @@@ $as_echo_n "checking looks... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14235 "configure"
 -// #line 13849 "configure"
++// #line 14394 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14349,7 -13962,7 +14508,7 @@@ $as_echo_n "checking jgoodies-looks... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14352 "configure"
 -// #line 13966 "configure"
++// #line 14511 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14467,7 -14080,7 +14626,7 @@@ $as_echo_n "checking skinlf... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14470 "configure"
 -// #line 14084 "configure"
++// #line 14629 "configure"
  import java.util.regex.Pattern;
  
  import com.l2fprod.util.AccessUtils;
@@@ -14584,7 -14197,7 +14743,7 @@@ $as_echo_n "checking jogl2... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14587 "configure"
 -// #line 14201 "configure"
++// #line 14746 "configure"
  import java.util.regex.Pattern;
  
  import javax.media.opengl.glu.GLUnurbs;
@@@ -14807,7 -14420,7 +14966,7 @@@ $as_echo_n "checking gluegen2-rt... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14810 "configure"
 -// #line 14424 "configure"
++// #line 14969 "configure"
  import java.util.regex.Pattern;
  
  import jogamp.common.os.MachineDescriptionRuntime;
@@@ -14981,7 -14594,7 +15140,7 @@@ $as_echo_n "checking jhall... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14984 "configure"
 -// #line 14598 "configure"
++// #line 15143 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -15096,7 -14709,7 +15255,7 @@@ $as_echo_n "checking javahelp2... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15099 "configure"
 -// #line 14713 "configure"
++// #line 15258 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -15214,7 -14827,7 +15373,7 @@@ $as_echo_n "checking jrosetta-API... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15217 "configure"
 -// #line 14831 "configure"
++// #line 15376 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15328,7 -14941,7 +15487,7 @@@ $as_echo_n "checking jrosetta-api... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15331 "configure"
 -// #line 14945 "configure"
++// #line 15490 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15446,7 -15059,7 +15605,7 @@@ $as_echo_n "checking jrosetta-engine..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15449 "configure"
 -// #line 15063 "configure"
++// #line 15608 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@@ -15552,7 -15165,7 +15711,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15555 "configure"
 -// #line 15169 "configure"
++// #line 15714 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
     else
  
      cat << \EOF > conftest.java
- // #line 15627 "configure"
 -// #line 15241 "configure"
++// #line 15786 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
@@@ -15717,7 -15330,7 +15876,7 @@@ $as_echo_n "checking jeuclid-core... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15720 "configure"
 -// #line 15334 "configure"
++// #line 15879 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.jeuclid.LayoutContext;
@@@ -15836,7 -15449,7 +15995,7 @@@ $as_echo_n "checking fop... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15839 "configure"
 -// #line 15453 "configure"
++// #line 15998 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.fop.pdf.PDFInfo;
@@@ -15960,7 -15573,7 +16119,7 @@@ $as_echo_n "checking freehep-graphics2d
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15963 "configure"
 -// #line 15577 "configure"
++// #line 16122 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphics2d.VectorGraphics;
@@@ -16077,7 -15690,7 +16236,7 @@@ $as_echo_n "checking freehep-graphicsio
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16080 "configure"
 -// #line 15694 "configure"
++// #line 16239 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphicsio.emf.EMFGraphics2D;
@@@ -16194,7 -15807,7 +16353,7 @@@ $as_echo_n "checking freehep-graphicsio
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16197 "configure"
 -// #line 15811 "configure"
++// #line 16356 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphicsio.VectorGraphicsIO;
@@@ -16311,7 -15924,7 +16470,7 @@@ $as_echo_n "checking freehep-io... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16314 "configure"
 -// #line 15928 "configure"
++// #line 16473 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.util.io.XMLSequence;
@@@ -16428,7 -16041,7 +16587,7 @@@ $as_echo_n "checking freehep-util... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16431 "configure"
 -// #line 16045 "configure"
++// #line 16590 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.util.StringUtilities;
@@@ -16546,7 -16159,7 +16705,7 @@@ $as_echo_n "checking batik-all... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16549 "configure"
 -// #line 16163 "configure"
++// #line 16708 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.parser.Parser;
@@@ -16663,7 -16276,7 +16822,7 @@@ $as_echo_n "checking batik... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16666 "configure"
 -// #line 16280 "configure"
++// #line 16825 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.parser.Parser;
@@@ -16770,7 -16383,7 +16929,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 16773 "configure"
 -// #line 16387 "configure"
++// #line 16932 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.Version;
     else
  
      cat << \EOF > conftest.java
- // #line 16845 "configure"
 -// #line 16459 "configure"
++// #line 17004 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.Version;
@@@ -16933,7 -16546,7 +17092,7 @@@ $as_echo_n "checking commons-io... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16936 "configure"
 -// #line 16550 "configure"
++// #line 17095 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.io.output.CountingOutputStream;
@@@ -17050,7 -16663,7 +17209,7 @@@ $as_echo_n "checking xmlgraphics-common
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17053 "configure"
 -// #line 16667 "configure"
++// #line 17212 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.xmlgraphics.util.Service;
@@@ -17167,7 -16780,7 +17326,7 @@@ $as_echo_n "checking avalon-framework..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17170 "configure"
 -// #line 16784 "configure"
++// #line 17329 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.avalon.framework.configuration.ConfigurationException;
@@@ -17284,7 -16897,7 +17443,7 @@@ $as_echo_n "checking xml-apis-ext... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17287 "configure"
 -// #line 16901 "configure"
++// #line 17446 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -17401,7 -17014,7 +17560,7 @@@ $as_echo_n "checking xml-commons-apis-e
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17404 "configure"
 -// #line 17018 "configure"
++// #line 17563 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -17522,7 -17135,7 +17681,7 @@@ $as_echo_n "checking commons-logging..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17525 "configure"
 -// #line 17139 "configure"
++// #line 17684 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.logging.LogFactory;
@@@ -17639,7 -17252,7 +17798,7 @@@ $as_echo_n "checking jlatexmath... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17642 "configure"
 -// #line 17256 "configure"
++// #line 17801 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -17746,7 -17359,7 +17905,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 17749 "configure"
 -// #line 17363 "configure"
++// #line 17908 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
     else
  
      cat << \EOF > conftest.java
- // #line 17821 "configure"
 -// #line 17435 "configure"
++// #line 17980 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -17909,7 -17522,7 +18068,7 @@@ $as_echo_n "checking jlatexmath-fop... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17912 "configure"
 -// #line 17526 "configure"
++// #line 18071 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@@ -18032,7 -17645,7 +18191,7 @@@ $as_echo_n "checking checkstyle... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18035 "configure"
 -// #line 17649 "configure"
++// #line 18194 "configure"
  import java.util.regex.Pattern;
  
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@@ -18149,7 -17762,7 +18308,7 @@@ $as_echo_n "checking commons-beanutils.
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18152 "configure"
 -// #line 17766 "configure"
++// #line 18311 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.beanutils.Converter;
@@@ -18266,7 -17879,7 +18425,7 @@@ $as_echo_n "checking antlr... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18269 "configure"
 -// #line 17883 "configure"
++// #line 18428 "configure"
  import java.util.regex.Pattern;
  
  import antlr.TokenStreamException;
@@@ -18383,7 -17996,7 +18542,7 @@@ $as_echo_n "checking junit4... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18386 "configure"
 -// #line 18000 "configure"
++// #line 18545 "configure"
  import java.util.regex.Pattern;
  
  import org.junit.Assert;
@@@ -18497,7 -18110,7 +18656,7 @@@ $as_echo_n "checking junit... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18500 "configure"
 -// #line 18114 "configure"
++// #line 18659 "configure"
  import java.util.regex.Pattern;
  
  import org.junit.Assert;
@@@ -18618,7 -18231,7 +18777,7 @@@ $as_echo_n "checking cobertura... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18621 "configure"
 -// #line 18235 "configure"
++// #line 18780 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.cobertura.merge.Main;
@@@ -18735,7 -18348,7 +18894,7 @@@ $as_echo_n "checking asm3... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18738 "configure"
 -// #line 18352 "configure"
++// #line 18897 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -18849,7 -18462,7 +19008,7 @@@ $as_echo_n "checking asm... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18852 "configure"
 -// #line 18466 "configure"
++// #line 19011 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -18966,7 -18579,7 +19125,7 @@@ $as_echo_n "checking ecj... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18969 "configure"
 -// #line 18583 "configure"
++// #line 19128 "configure"
  import java.util.regex.Pattern;
  
  import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&5
  $as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&6; }
  if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = xyes; then :
 -  FFTW3_LIB="-L$with_fftw_library -lfftw3"
 +  FFTW3_LIB="-L$with_fftw_library -lfftw3"
 +else
 +  as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c) in $with_fftw_library. Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
 +
 +fi
 +
-       LIBS="$save_LIBS"
++    LIBS="$save_LIBS"
 +else
-       save_LIBS="$LIBS"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
++    save_LIBS="$LIBS"
++    if $WITH_DEVTOOLS; then # Scilab thirdparties
++        FFTW3_LIB="-L$DEVTOOLS_LIBDIR -lfftw3"
++    else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
 +$as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
 +if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lfftw3  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char fftw_plan_dft_r2c ();
 +int
 +main ()
 +{
 +return fftw_plan_dft_r2c ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_fftw3_fftw_plan_dft_r2c=yes
 +else
 +  ac_cv_lib_fftw3_fftw_plan_dft_r2c=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&5
 +$as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&6; }
 +if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = xyes; then :
 +  FFTW3_LIB="-lfftw3"
  else
 -  as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c) in $with_fftw_library. Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
 +  as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c). Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
  
  fi
  
-       LIBS="$save_LIBS"
++    fi
+     LIBS="$save_LIBS"
 +fi
 +
 +
 +$as_echo "#define WITH_FFTW /**/" >>confdefs.h
 +
 +
 +
 +   FFTW_ENABLE=yes
 +fi
 +
 +
 + if test "$with_fftw" != no; then
 +  FFTW_TRUE=
 +  FFTW_FALSE='#'
  else
 -    save_LIBS="$LIBS"
 -    if $WITH_DEVTOOLS; then # Scilab thirdparties
 -        FFTW3_LIB="-L$DEVTOOLS_LIBDIR -lfftw3"
 -    else
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
 -$as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
 -if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
 +  FFTW_TRUE='#'
 +  FFTW_FALSE=
 +fi
 +
 +
 +
 +#################
 +## EIGEN
 +#################
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 +if test -z "$CXXCPP"; then
 +  if ${ac_cv_prog_CXXCPP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lfftw3  $LIBS"
 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +                   Syntax error
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +  break
 +fi
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
 +
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
 +else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
 +$as_echo "$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
  #endif
 -char fftw_plan_dft_r2c ();
 -int
 -main ()
 -{
 -return fftw_plan_dft_r2c ();
 -  ;
 -  return 0;
 -}
 +                   Syntax error
  _ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_fftw3_fftw_plan_dft_r2c=yes
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
  else
 -  ac_cv_lib_fftw3_fftw_plan_dft_r2c=no
 +  # Broken: fails on valid input.
 +continue
  fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
  fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&5
 -$as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&6; }
 -if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = xyes; then :
 -  FFTW3_LIB="-lfftw3"
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
  else
 -  as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c). Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +# Check whether --with-eigen_include was given.
 +if test "${with_eigen_include+set}" = set; then :
 +  withval=$with_eigen_include; with_eigen_include=$withval
 +else
 +  with_eigen_include='yes'
  
  fi
  
  fi
  
  
 - if test "$with_fftw" != no; then
 -  FFTW_TRUE=
 -  FFTW_FALSE='#'
 +    PATH_TO_EIGEN="/usr/include/eigen3/"
 +fi
 +CPPFLAGS="$save_CPPFLAGS"
 +
 +CHK_EIGEN_WORLD=3
 +CHK_EIGEN_MAJOR=1
 +CHK_EIGEN_MINOR=0
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5
 +$as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; }
 +cat > conftest.$ac_ext <<EOF
- #line 23204 "configure"
++#line 23371 "configure"
 +#include "confdefs.h"
 +
 +#include "$PATH_TO_EIGEN/Eigen/Sparse"
 +#if EIGEN_VERSION_AT_LEAST(3,1,0)
 +EIGEN_VERSION_OK
 +#endif
 +
 +EOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  grep "EIGEN_VERSION_OK" >/dev/null 2>&1; then
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=1
  else
 -  FFTW_TRUE='#'
 -  FFTW_FALSE=
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=0
 +fi
 +rm -f conftest*
 +
 +if test $EIGEN_VERSION_OK = 0; then
 +   as_fn_error $? "Version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR of Eigen expected (at least)" "$LINENO" 5
 +else
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
  fi
  
  
@@@ -27752,7 -27165,7 +27953,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 27755 "configure"
 -#line 27169 "configure"
++#line 27956 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -28063,7 -27476,7 +28264,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 28066 "configure"
 -#line 27480 "configure"
++#line 28267 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -28647,7 -28065,7 +28853,7 @@@ $as_echo_n "checking saxon9he... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28650 "configure"
 -// #line 28069 "configure"
++// #line 28856 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -28762,7 -28180,7 +28968,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28765 "configure"
 -// #line 28184 "configure"
++// #line 28971 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -28878,7 -28296,7 +29084,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28881 "configure"
 -// #line 28300 "configure"
++// #line 29087 "configure"
  import java.util.regex.Pattern;
  
  import com.icl.saxon.Loader;
@@@ -24,8 -24,20 +24,20 @@@ SCI_BUILDDIR="`pwd`
  SCI_SRCDIR="$srcdir"
  SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
  
+ if test -d "$SCI_SRCDIR_FULL/usr"; then
+     WITH_DEVTOOLS=true
+     DEVTOOLS_BINDIR="$SCI_SRCDIR_FULL/usr/bin"
+     DEVTOOLS_INCDIR="$SCI_SRCDIR_FULL/usr/include"
+     DEVTOOLS_LIBDIR="$SCI_SRCDIR_FULL/usr/lib"
+ else
+     WITH_DEVTOOLS=false
+     DEVTOOLS_BINDIR=
+     DEVTOOLS_INCDIR=
+     DEVTOOLS_LIBDIR=
+ fi
 -SCILAB_VERSION_MAJOR=5
 -SCILAB_VERSION_MINOR=6
 +SCILAB_VERSION_MAJOR=6
 +SCILAB_VERSION_MINOR=0
  SCILAB_VERSION_MAINTENANCE=0
  AC_SUBST(SCILAB_VERSION_MAJOR)
  AC_SUBST(SCILAB_VERSION_MINOR)
  # This file is distributed under the same license as the Scilab package.
  
  
 -FILEIO_SOURCES = src/c/FileExist.c \
 -src/c/scanf_functions.c \
 -src/c/do_xxscanf.c \
 -src/c/findfiles.c \
 -src/c/Status2Mode.c \
 -src/c/addfile.c \
 -src/c/delfile.c \
 -src/c/filesmanagement.c \
 -src/c/getfiledesc.c \
 -src/c/getfileinfo.c \
 -src/c/getfiletype.c \
 -src/c/mclearerr.c \
 -src/c/mclose.c \
 -src/c/meof.c \
 -src/c/merror.c \
 -src/c/mget.c \
 -src/c/mgetl.c \
 -src/c/mgeti.c \
 -src/c/mgetstr.c \
 -src/c/mopen.c \
 -src/c/mput.c \
 -src/c/mputi.c \
 -src/c/mputstr.c \
 -src/c/mseek.c \
 -src/c/mtell.c \
 -src/c/readline.c \
 -src/c/getdrives.c \
 -src/c/deleteafile.c \
 -src/c/getshortpathname.c \
 -src/c/getlongpathname.c \
 -src/c/FindFileExtension.c \
 -src/c/URIFileToFilename.c \
 -src/c/createdirectory.c \
 -src/c/isdir.c \
 -src/c/isDrive.c \
 -src/c/removedir.c \
 -src/c/cluni0.c \
 -src/c/scicurdir.c \
 -src/c/fullpath.c \
 -src/c/fileinfo.c \
 -src/c/getrelativefilename.c \
 -src/c/splitpath.c \
 -src/c/movefile.c \
 -src/c/expandPathVariable.c \
 -src/c/basename.c \
 -src/c/pathconvert.c \
 -src/c/copyfile_others.c \
 -src/c/getFullFilename.c \
 -src/c/mputl.c \
 -src/c/fscanfMat.c \
 -src/c/fprintfMat.c \
 -src/c/createtempfilename.c \
 -src/c/dlManager.c \
 -src/c/convert_tools.c
 -
 -GATEWAY_SOURCES = \
 -sci_gateway/c/gw_fileio.c \
 -sci_gateway/c/sci_mfprintf.c \
 -sci_gateway/c/sci_mscanf.c \
 -sci_gateway/c/sci_msscanf.c \
 -sci_gateway/c/sci_mfscanf.c \
 -sci_gateway/c/sci_fprintfMat.c \
 -sci_gateway/c/sci_fscanfMat.c \
 -sci_gateway/c/sci_findfiles.c \
 -sci_gateway/c/sci_maxfiles.c \
 -sci_gateway/c/sci_getdrives.c \
 -sci_gateway/c/sci_fullpath.c \
 -sci_gateway/c/sci_deletefile.c \
 -sci_gateway/c/sci_pathsep.c \
 -sci_gateway/c/sci_filesep.c \
 -sci_gateway/c/sci_getshortpathname.c \
 -sci_gateway/c/sci_getlongpathname.c \
 -sci_gateway/c/sci_fileext.c \
 -sci_gateway/c/sci_isdir.c \
 -sci_gateway/c/sci_removedir.c \
 -sci_gateway/c/sci_createdir.c \
 -sci_gateway/c/sci_chdir.c \
 -sci_gateway/c/sci_pwd.c \
 -sci_gateway/c/sci_mclearerr.c \
 -sci_gateway/c/sci_mclose.c \
 -sci_gateway/c/sci_merror.c \
 -sci_gateway/c/sci_mget.c \
 -sci_gateway/c/sci_mgetl.c \
 -sci_gateway/c/sci_mgetstr.c \
 -sci_gateway/c/sci_moef.c \
 -sci_gateway/c/sci_mopen.c \
 -sci_gateway/c/sci_mput.c \
 -sci_gateway/c/sci_mputstr.c \
 -sci_gateway/c/sci_mseek.c \
 -sci_gateway/c/sci_mtell.c \
 -sci_gateway/c/sci_fileinfo.c \
 -sci_gateway/c/sci_newest.c \
 -sci_gateway/c/sci_get_absolute_file_path.c  \
 -sci_gateway/c/sci_getrelativefilename.c \
 -sci_gateway/c/sci_copyfile.c \
 -sci_gateway/c/sci_fileparts.c \
 -sci_gateway/c/sci_movefile.c \
 -sci_gateway/c/sci_basename.c \
 -sci_gateway/c/sci_pathconvert.c \
 -sci_gateway/c/sci_isfile.c \
 -sci_gateway/c/sci_mputl.c \
 -sci_gateway/c/sci_tempname.c \
 -sci_gateway/c/sci_getURL.c \
 -sci_gateway/c/sci_splitURL.c
 -
 -
 -libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              -I$(top_srcdir)/modules/io/includes/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                              -I$(top_srcdir)/modules/string/includes/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/preferences/includes/ \
 -                              $(XML_FLAGS) \
 -                              $(CURL_CFLAGS) \
 -                              $(AM_CPPFLAGS)
 +FILEIO_C_SOURCES = \
 +    src/c/FileExist.c \
 +    src/c/scanf_functions.c \
 +    src/c/do_xxscanf.c \
 +    src/c/findfiles.c \
 +    src/c/Status2Mode.c \
 +    src/c/filesmanagement.c \
 +    src/c/mgeti.c \
 +    src/c/mputi.c \
 +    src/c/readline.c \
 +    src/c/getdrives.c \
 +    src/c/deleteafile.c \
 +    src/c/getshortpathname.c \
 +    src/c/getlongpathname.c \
 +    src/c/FindFileExtension.c \
 +    src/c/URIFileToFilename.c \
 +    src/c/createdirectory.c \
 +    src/c/isdir.c \
 +    src/c/isDrive.c \
 +    src/c/removedir.c \
 +    src/c/cluni0.c \
 +    src/c/scicurdir.c \
 +    src/c/fullpath.c \
 +    src/c/fileinfo.c \
 +    src/c/getrelativefilename.c \
 +    src/c/splitpath.c \
 +    src/c/movefile.c \
 +    src/c/basename.c \
 +    src/c/pathconvert.c \
 +    src/c/copyfile_others.c \
 +    src/c/getFullFilename.c \
 +    src/c/os_wfopen.c \
 +    src/c/fscanfMat.c \
 +    src/c/fprintfMat.c \
 +    src/c/createtempfilename.c \
 +      src/c/dlManager.c \
 +      src/c/convert_tools.c
 +
 +GATEWAY_C_SOURCES = \
 +    sci_gateway/c/gw_fileio.c \
 +    sci_gateway/c/sci_fprintfMat.c \
 +    sci_gateway/c/sci_fscanfMat.c \
 +    sci_gateway/c/sci_chdir.c \
 +    sci_gateway/c/sci_pwd.c \
 +    sci_gateway/c/sci_copyfile.c \
 +    sci_gateway/c/sci_tempname.c \
 +    sci_gateway/c/sci_movefile.c \
 +      sci_gateway/c/sci_getURL.c \
 +      sci_gateway/c/sci_splitURL.c
 +
 +GATEWAY_CPP_SOURCES = \
 +      sci_gateway/cpp/fileio_gw.cpp \
 +      sci_gateway/cpp/sci_mopen.cpp \
 +      sci_gateway/cpp/sci_mclose.cpp \
 +      sci_gateway/cpp/sci_mget.cpp \
 +      sci_gateway/cpp/sci_mput.cpp \
 +      sci_gateway/cpp/sci_mputl.cpp \
 +      sci_gateway/cpp/sci_mgetl.cpp \
 +      sci_gateway/cpp/sci_pathconvert.cpp \
 +      sci_gateway/cpp/sci_isdir.cpp \
 +      sci_gateway/cpp/sci_filesep.cpp \
 +      sci_gateway/cpp/sci_fileparts.cpp \
 +      sci_gateway/cpp/sci_findfiles.cpp \
 +      sci_gateway/cpp/sci_basename.cpp \
 +      sci_gateway/cpp/sci_fileinfo.cpp \
 +      sci_gateway/cpp/sci_isfile.cpp \
 +      sci_gateway/cpp/sci_deletefile.cpp \
 +      sci_gateway/cpp/sci_getshortpathname.cpp \
 +      sci_gateway/cpp/sci_getlongpathname.cpp \
 +      sci_gateway/cpp/sci_fileext.cpp \
 +      sci_gateway/cpp/sci_createdir.cpp \
 +      sci_gateway/cpp/sci_fullpath.cpp \
 +      sci_gateway/cpp/sci_removedir.cpp \
 +      sci_gateway/cpp/sci_meof.cpp \
 +      sci_gateway/cpp/sci_mputstr.cpp \
 +      sci_gateway/cpp/sci_mgetstr.cpp \
 +      sci_gateway/cpp/sci_mseek.cpp \
 +      sci_gateway/cpp/sci_mtell.cpp \
 +      sci_gateway/cpp/sci_newest.cpp \
 +      sci_gateway/cpp/sci_merror.cpp \
 +      sci_gateway/cpp/sci_mclearerr.cpp \
 +      sci_gateway/cpp/sci_get_absolute_file_path.cpp \
 +      sci_gateway/cpp/sci_getrelativefilename.cpp \
 +      sci_gateway/cpp/sci_pathsep.cpp \
 +      sci_gateway/cpp/sci_mfprintf.cpp \
 +      sci_gateway/cpp/sci_mfscanf.cpp \
 +      sci_gateway/cpp/sci_mscanf.cpp \
 +      sci_gateway/cpp/sci_msscanf.cpp \
 +      sci_gateway/cpp/sci_getdrives.cpp
 +
 +FILEIO_CPP_SOURCES = \
 +      src/cpp/expandPathVariable.cpp \
 +      src/cpp/mopen.cpp \
 +      src/cpp/mclose.cpp \
 +      src/cpp/mput.cpp \
 +      src/cpp/mget.cpp \
 +      src/cpp/mputl.cpp \
 +      src/cpp/mgetl.cpp \
 +      src/cpp/mgetstr.cpp \
 +      src/cpp/filemanager.cpp \
 +      src/cpp/mseek.cpp \
 +      src/cpp/mtell.cpp \
 +      src/cpp/newest.cpp \
 +      src/cpp/scilab_sscanf.cpp \
 +    src/cpp/addfile.cpp \
 +    src/cpp/delfile.cpp \
 +    src/cpp/getfiledesc.cpp \
 +    src/cpp/getfileinfo.cpp \
 +    src/cpp/getfiletype.cpp
 +
 +libscifileio_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
 +      -I$(srcdir)/src/c/ \
 +      -I$(srcdir)/src/cpp/ \
 +    -I$(top_srcdir)/modules/ast/includes/ast/ \
 +    -I$(top_srcdir)/modules/ast/includes/exps/ \
 +    -I$(top_srcdir)/modules/ast/includes/operations/ \
 +    -I$(top_srcdir)/modules/ast/includes/parse/ \
 +    -I$(top_srcdir)/modules/ast/includes/symbol/ \
 +    -I$(top_srcdir)/modules/ast/includes/system_env/ \
 +    -I$(top_srcdir)/modules/ast/includes/types/ \
 +    -I$(top_srcdir)/modules/ast/includes/analysis/ \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +      -I$(top_srcdir)/modules/string/includes \
 +      -I$(top_srcdir)/modules/io/includes \
 +      -I$(top_srcdir)/modules/threads/includes \
 +      -I$(top_srcdir)/modules/console/includes \
 +      -I$(top_srcdir)/modules/localization/includes \
 +      -I$(top_srcdir)/modules/dynamic_link/includes \
 +      -I$(top_srcdir)/modules/preferences/includes \
 +      $(HDF5_CFLAGS) \
 +      $(XML_FLAGS) \
-     $(EIGEN_CPPFLAGS) \
++      $(CURL_CFLAGS) \
++      $(EIGEN_CPPFLAGS) \
 +      $(AM_CPPFLAGS)
 +
  
  if MAINTAINER_MODE
  pkglib_LTLIBRARIES = libscifileio.la
@@@ -652,143 -624,122 +652,144 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -FILEIO_SOURCES = src/c/FileExist.c \
 -src/c/scanf_functions.c \
 -src/c/do_xxscanf.c \
 -src/c/findfiles.c \
 -src/c/Status2Mode.c \
 -src/c/addfile.c \
 -src/c/delfile.c \
 -src/c/filesmanagement.c \
 -src/c/getfiledesc.c \
 -src/c/getfileinfo.c \
 -src/c/getfiletype.c \
 -src/c/mclearerr.c \
 -src/c/mclose.c \
 -src/c/meof.c \
 -src/c/merror.c \
 -src/c/mget.c \
 -src/c/mgetl.c \
 -src/c/mgeti.c \
 -src/c/mgetstr.c \
 -src/c/mopen.c \
 -src/c/mput.c \
 -src/c/mputi.c \
 -src/c/mputstr.c \
 -src/c/mseek.c \
 -src/c/mtell.c \
 -src/c/readline.c \
 -src/c/getdrives.c \
 -src/c/deleteafile.c \
 -src/c/getshortpathname.c \
 -src/c/getlongpathname.c \
 -src/c/FindFileExtension.c \
 -src/c/URIFileToFilename.c \
 -src/c/createdirectory.c \
 -src/c/isdir.c \
 -src/c/isDrive.c \
 -src/c/removedir.c \
 -src/c/cluni0.c \
 -src/c/scicurdir.c \
 -src/c/fullpath.c \
 -src/c/fileinfo.c \
 -src/c/getrelativefilename.c \
 -src/c/splitpath.c \
 -src/c/movefile.c \
 -src/c/expandPathVariable.c \
 -src/c/basename.c \
 -src/c/pathconvert.c \
 -src/c/copyfile_others.c \
 -src/c/getFullFilename.c \
 -src/c/mputl.c \
 -src/c/fscanfMat.c \
 -src/c/fprintfMat.c \
 -src/c/createtempfilename.c \
 -src/c/dlManager.c \
 -src/c/convert_tools.c
 -
 -GATEWAY_SOURCES = \
 -sci_gateway/c/gw_fileio.c \
 -sci_gateway/c/sci_mfprintf.c \
 -sci_gateway/c/sci_mscanf.c \
 -sci_gateway/c/sci_msscanf.c \
 -sci_gateway/c/sci_mfscanf.c \
 -sci_gateway/c/sci_fprintfMat.c \
 -sci_gateway/c/sci_fscanfMat.c \
 -sci_gateway/c/sci_findfiles.c \
 -sci_gateway/c/sci_maxfiles.c \
 -sci_gateway/c/sci_getdrives.c \
 -sci_gateway/c/sci_fullpath.c \
 -sci_gateway/c/sci_deletefile.c \
 -sci_gateway/c/sci_pathsep.c \
 -sci_gateway/c/sci_filesep.c \
 -sci_gateway/c/sci_getshortpathname.c \
 -sci_gateway/c/sci_getlongpathname.c \
 -sci_gateway/c/sci_fileext.c \
 -sci_gateway/c/sci_isdir.c \
 -sci_gateway/c/sci_removedir.c \
 -sci_gateway/c/sci_createdir.c \
 -sci_gateway/c/sci_chdir.c \
 -sci_gateway/c/sci_pwd.c \
 -sci_gateway/c/sci_mclearerr.c \
 -sci_gateway/c/sci_mclose.c \
 -sci_gateway/c/sci_merror.c \
 -sci_gateway/c/sci_mget.c \
 -sci_gateway/c/sci_mgetl.c \
 -sci_gateway/c/sci_mgetstr.c \
 -sci_gateway/c/sci_moef.c \
 -sci_gateway/c/sci_mopen.c \
 -sci_gateway/c/sci_mput.c \
 -sci_gateway/c/sci_mputstr.c \
 -sci_gateway/c/sci_mseek.c \
 -sci_gateway/c/sci_mtell.c \
 -sci_gateway/c/sci_fileinfo.c \
 -sci_gateway/c/sci_newest.c \
 -sci_gateway/c/sci_get_absolute_file_path.c  \
 -sci_gateway/c/sci_getrelativefilename.c \
 -sci_gateway/c/sci_copyfile.c \
 -sci_gateway/c/sci_fileparts.c \
 -sci_gateway/c/sci_movefile.c \
 -sci_gateway/c/sci_basename.c \
 -sci_gateway/c/sci_pathconvert.c \
 -sci_gateway/c/sci_isfile.c \
 -sci_gateway/c/sci_mputl.c \
 -sci_gateway/c/sci_tempname.c \
 -sci_gateway/c/sci_getURL.c \
 -sci_gateway/c/sci_splitURL.c
 -
 -libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              -I$(top_srcdir)/modules/io/includes/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                              -I$(top_srcdir)/modules/string/includes/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/preferences/includes/ \
 -                              $(XML_FLAGS) \
 -                              $(CURL_CFLAGS) \
 -                              $(AM_CPPFLAGS)
 +yacc_present = @yacc_present@
 +FILEIO_C_SOURCES = \
 +    src/c/FileExist.c \
 +    src/c/scanf_functions.c \
 +    src/c/do_xxscanf.c \
 +    src/c/findfiles.c \
 +    src/c/Status2Mode.c \
 +    src/c/filesmanagement.c \
 +    src/c/mgeti.c \
 +    src/c/mputi.c \
 +    src/c/readline.c \
 +    src/c/getdrives.c \
 +    src/c/deleteafile.c \
 +    src/c/getshortpathname.c \
 +    src/c/getlongpathname.c \
 +    src/c/FindFileExtension.c \
 +    src/c/URIFileToFilename.c \
 +    src/c/createdirectory.c \
 +    src/c/isdir.c \
 +    src/c/isDrive.c \
 +    src/c/removedir.c \
 +    src/c/cluni0.c \
 +    src/c/scicurdir.c \
 +    src/c/fullpath.c \
 +    src/c/fileinfo.c \
 +    src/c/getrelativefilename.c \
 +    src/c/splitpath.c \
 +    src/c/movefile.c \
 +    src/c/basename.c \
 +    src/c/pathconvert.c \
 +    src/c/copyfile_others.c \
 +    src/c/getFullFilename.c \
 +    src/c/os_wfopen.c \
 +    src/c/fscanfMat.c \
 +    src/c/fprintfMat.c \
 +    src/c/createtempfilename.c \
 +      src/c/dlManager.c \
 +      src/c/convert_tools.c
 +
 +GATEWAY_C_SOURCES = \
 +    sci_gateway/c/gw_fileio.c \
 +    sci_gateway/c/sci_fprintfMat.c \
 +    sci_gateway/c/sci_fscanfMat.c \
 +    sci_gateway/c/sci_chdir.c \
 +    sci_gateway/c/sci_pwd.c \
 +    sci_gateway/c/sci_copyfile.c \
 +    sci_gateway/c/sci_tempname.c \
 +    sci_gateway/c/sci_movefile.c \
 +      sci_gateway/c/sci_getURL.c \
 +      sci_gateway/c/sci_splitURL.c
 +
 +GATEWAY_CPP_SOURCES = \
 +      sci_gateway/cpp/fileio_gw.cpp \
 +      sci_gateway/cpp/sci_mopen.cpp \
 +      sci_gateway/cpp/sci_mclose.cpp \
 +      sci_gateway/cpp/sci_mget.cpp \
 +      sci_gateway/cpp/sci_mput.cpp \
 +      sci_gateway/cpp/sci_mputl.cpp \
 +      sci_gateway/cpp/sci_mgetl.cpp \
 +      sci_gateway/cpp/sci_pathconvert.cpp \
 +      sci_gateway/cpp/sci_isdir.cpp \
 +      sci_gateway/cpp/sci_filesep.cpp \
 +      sci_gateway/cpp/sci_fileparts.cpp \
 +      sci_gateway/cpp/sci_findfiles.cpp \
 +      sci_gateway/cpp/sci_basename.cpp \
 +      sci_gateway/cpp/sci_fileinfo.cpp \
 +      sci_gateway/cpp/sci_isfile.cpp \
 +      sci_gateway/cpp/sci_deletefile.cpp \
 +      sci_gateway/cpp/sci_getshortpathname.cpp \
 +      sci_gateway/cpp/sci_getlongpathname.cpp \
 +      sci_gateway/cpp/sci_fileext.cpp \
 +      sci_gateway/cpp/sci_createdir.cpp \
 +      sci_gateway/cpp/sci_fullpath.cpp \
 +      sci_gateway/cpp/sci_removedir.cpp \
 +      sci_gateway/cpp/sci_meof.cpp \
 +      sci_gateway/cpp/sci_mputstr.cpp \
 +      sci_gateway/cpp/sci_mgetstr.cpp \
 +      sci_gateway/cpp/sci_mseek.cpp \
 +      sci_gateway/cpp/sci_mtell.cpp \
 +      sci_gateway/cpp/sci_newest.cpp \
 +      sci_gateway/cpp/sci_merror.cpp \
 +      sci_gateway/cpp/sci_mclearerr.cpp \
 +      sci_gateway/cpp/sci_get_absolute_file_path.cpp \
 +      sci_gateway/cpp/sci_getrelativefilename.cpp \
 +      sci_gateway/cpp/sci_pathsep.cpp \
 +      sci_gateway/cpp/sci_mfprintf.cpp \
 +      sci_gateway/cpp/sci_mfscanf.cpp \
 +      sci_gateway/cpp/sci_mscanf.cpp \
 +      sci_gateway/cpp/sci_msscanf.cpp \
 +      sci_gateway/cpp/sci_getdrives.cpp
 +
 +FILEIO_CPP_SOURCES = \
 +      src/cpp/expandPathVariable.cpp \
 +      src/cpp/mopen.cpp \
 +      src/cpp/mclose.cpp \
 +      src/cpp/mput.cpp \
 +      src/cpp/mget.cpp \
 +      src/cpp/mputl.cpp \
 +      src/cpp/mgetl.cpp \
 +      src/cpp/mgetstr.cpp \
 +      src/cpp/filemanager.cpp \
 +      src/cpp/mseek.cpp \
 +      src/cpp/mtell.cpp \
 +      src/cpp/newest.cpp \
 +      src/cpp/scilab_sscanf.cpp \
 +    src/cpp/addfile.cpp \
 +    src/cpp/delfile.cpp \
 +    src/cpp/getfiledesc.cpp \
 +    src/cpp/getfileinfo.cpp \
 +    src/cpp/getfiletype.cpp
 +
 +libscifileio_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
 +      -I$(srcdir)/src/c/ \
 +      -I$(srcdir)/src/cpp/ \
 +    -I$(top_srcdir)/modules/ast/includes/ast/ \
 +    -I$(top_srcdir)/modules/ast/includes/exps/ \
 +    -I$(top_srcdir)/modules/ast/includes/operations/ \
 +    -I$(top_srcdir)/modules/ast/includes/parse/ \
 +    -I$(top_srcdir)/modules/ast/includes/symbol/ \
 +    -I$(top_srcdir)/modules/ast/includes/system_env/ \
 +    -I$(top_srcdir)/modules/ast/includes/types/ \
 +    -I$(top_srcdir)/modules/ast/includes/analysis/ \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +      -I$(top_srcdir)/modules/string/includes \
 +      -I$(top_srcdir)/modules/io/includes \
 +      -I$(top_srcdir)/modules/threads/includes \
 +      -I$(top_srcdir)/modules/console/includes \
 +      -I$(top_srcdir)/modules/localization/includes \
 +      -I$(top_srcdir)/modules/dynamic_link/includes \
 +      -I$(top_srcdir)/modules/preferences/includes \
 +      $(HDF5_CFLAGS) \
 +      $(XML_FLAGS) \
-     $(EIGEN_CPPFLAGS) \
++      $(CURL_CFLAGS) \
++      $(EIGEN_CPPFLAGS) \
 +      $(AM_CPPFLAGS)
  
  @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscifileio.la
  @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscifileio-algo.la libscifileio.la