* New functions introduced: 13/10113/5
Sylvestre Ledru [Fri, 4 Jan 2013 06:56:55 +0000 (07:56 +0100)]
 - getURLcontent - Return the content of an URL (HTTP, HTTPS, FTP...)
 - getURL - Download an URL (HTTP, HTTPS, FTP...)
 - splitURL - Split a URL (HTTP, HTTPS, FTP...)

To test:
test_run("fileio",["getURL","getURLcontent","splitURL"])

Change-Id: I56b775794a144053dba90bb2bce1f69f47a555e1

120 files changed:
SEP/INDEX
SEP/SEP_088_file_remote.odt [new file with mode: 0644]
scilab/CHANGES_5.5.X
scilab/Makefile.in
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/libs/.gitignore
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/m4/curl.m4 [new file with mode: 0644]
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/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/machine.h.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/help/en_US/getURL.xml [new file with mode: 0644]
scilab/modules/fileio/help/en_US/getURLcontent.xml [new file with mode: 0644]
scilab/modules/fileio/help/en_US/splitURL.xml [new file with mode: 0644]
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/license.txt
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_getURL.c [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/c/sci_getURLcontent.c [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/c/sci_splitURL.c [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/fileio_gateway.xml
scilab/modules/fileio/src/c/DllmainFileio.c
scilab/modules/fileio/src/c/dlManager.c [new file with mode: 0644]
scilab/modules/fileio/src/c/dlManager.h [new file with mode: 0644]
scilab/modules/fileio/tests/nonreg_tests/ticket_495.tst [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/getURL.dia.ref [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/getURL.tst [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/getURLcontent.dia.ref [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/getURLcontent.tst [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/splitURL.dia.ref [new file with mode: 0644]
scilab/modules/fileio/tests/unit_tests/splitURL.tst [new file with mode: 0644]
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/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_browser/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/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/preferences/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/scinotes/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/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.in

index 9264972..68db58f 100644 (file)
--- a/SEP/INDEX
+++ b/SEP/INDEX
@@ -83,4 +83,5 @@ SEP #083: example_run function
 SEP #084: fft improvements
 SEP #085: cond improvements
 SEP #086: Improvement of the regexp function
-SEP #087: New binaries: xcos scinotes
\ No newline at end of file
+SEP #087: New binaries: xcos scinotes
+SEP #088: Remote file access functions
\ No newline at end of file
diff --git a/SEP/SEP_088_file_remote.odt b/SEP/SEP_088_file_remote.odt
new file mode 100644 (file)
index 0000000..1b626d2
Binary files /dev/null and b/SEP/SEP_088_file_remote.odt differ
index f8e7dc1..c8442e0 100644 (file)
@@ -1,6 +1,14 @@
                     Changes between version 5.4.X and 5.5.0
                     =======================================
 
+New features
+=============
+
+* New functions introduced:
+ - getURLcontent - Return the content of an URL (HTTP, HTTPS, FTP...)
+ - getURL - Download an URL (HTTP, HTTPS, FTP...)
+ - splitURL - Split a URL (HTTP, HTTPS, FTP...)
+
 
 Syntax changes
 ===============
index 56dbce7..2c47006 100644 (file)
@@ -112,10 +112,11 @@ check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -389,6 +390,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3265f1e..68f6a0c 100644 (file)
@@ -3273,6 +3273,7 @@ AC_SUBST([am__untar])
 
 m4_include([m4/backtrace.m4])
 m4_include([m4/compiler.m4])
+m4_include([m4/curl.m4])
 m4_include([m4/docbook.m4])
 m4_include([m4/doxygen.m4])
 m4_include([m4/fftw.m4])
index dcb6874..ac4139f 100755 (executable)
@@ -691,6 +691,10 @@ X_LIBS
 X_PRE_LIBS
 X_CFLAGS
 XMKMF
+CURL_VERSION
+CURL_LIBS
+CURL_CFLAGS
+CURL_CONFIG
 PCRE_VERSION
 PCRE_LIBS
 PCRE_CFLAGS
@@ -996,6 +1000,7 @@ with_umfpack
 with_umfpack_library
 with_umfpack_include
 with_pcre
+with_curl
 with_tcl_library
 with_tcl_include
 with_tk_library
@@ -1032,6 +1037,8 @@ CXXFLAGS
 CCC
 PCRE_CFLAGS
 PCRE_LIBS
+CURL_CFLAGS
+CURL_LIBS
 XMKMF
 MATIO_CFLAGS
 MATIO_LIBS
@@ -1747,6 +1754,7 @@ Optional Packages:
                           Set the path to the UMFPACK headers
   --with-pcre=DIR         Set the path to your PCRE (Perl 5 Compatible Regular
                           Expression Library) installation
+  --with-curl=DIR         Set the path to your CURL installation
   --with-tcl-library=DIR  Set the path to the TCL library
   --with-tcl-include=DIR  Set the path to the TCL headers
   --with-tk-library=DIR   Set the path to the TK library
@@ -1781,6 +1789,8 @@ Some influential environment variables:
   CXXFLAGS    C++ compiler flags
   PCRE_CFLAGS C compiler flags for PCRE, overriding pkg-config
   PCRE_LIBS   linker flags for PCRE, overriding pkg-config
+  CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
+  CURL_LIBS   linker flags for CURL, overriding pkg-config
   XMKMF       Path to xmkmf, Makefile generator for X Window System
   MATIO_CFLAGS
               C compiler flags for MATIO, overriding pkg-config
@@ -10601,7 +10611,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 10604 "configure"
+// #line 10614 "configure"
 import java.util.regex.Pattern;
 
 
@@ -10688,7 +10698,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 10691 "configure"
+// #line 10701 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -10772,7 +10782,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 10775 "configure"
+// #line 10785 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -10837,7 +10847,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 10840 "configure"
+// #line 10850 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -10902,7 +10912,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 10905 "configure"
+// #line 10915 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -10967,7 +10977,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 10970 "configure"
+// #line 10980 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -12351,7 +12361,7 @@ $as_echo_n "checking jgraphx... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12354 "configure"
+// #line 12364 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.model.mxCell;
@@ -12458,7 +12468,7 @@ $as_echo_n "checking minimal version (1.8.0.0) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12461 "configure"
+// #line 12471 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -12530,7 +12540,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12533 "configure"
+// #line 12543 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -12624,7 +12634,7 @@ $as_echo_n "checking scirenderer... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12627 "configure"
+// #line 12637 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -12731,7 +12741,7 @@ $as_echo_n "checking minimal version (1.0.5) of scirenderer... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12734 "configure"
+// #line 12744 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -12803,7 +12813,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12806 "configure"
+// #line 12816 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -12894,7 +12904,7 @@ $as_echo_n "checking flexdock... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12897 "configure"
+// #line 12907 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.docking.DockingManager;
@@ -13001,7 +13011,7 @@ $as_echo_n "checking minimal version (1.2.2) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13004 "configure"
+// #line 13014 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13073,7 +13083,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13076 "configure"
+// #line 13086 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13164,7 +13174,7 @@ $as_echo_n "checking looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13167 "configure"
+// #line 13177 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13281,7 +13291,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13284 "configure"
+// #line 13294 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13399,7 +13409,7 @@ $as_echo_n "checking skinlf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13402 "configure"
+// #line 13412 "configure"
 import java.util.regex.Pattern;
 
 import com.l2fprod.util.AccessUtils;
@@ -13516,7 +13526,7 @@ $as_echo_n "checking jogl2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13519 "configure"
+// #line 13529 "configure"
 import java.util.regex.Pattern;
 
 import javax.media.opengl.glu.GLUnurbs;
@@ -13622,7 +13632,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl -L/usr/lib64/jogl"                 # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl2 -L/usr/lib64/jogl2"               # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexParameterf in -ljogl_desktop" >&5
 $as_echo_n "checking for glTexParameterf in -ljogl_desktop... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jogl_desktop_glTexParameterf" >&5
 $as_echo "$ac_cv_lib_jogl_desktop_glTexParameterf" >&6; }
 if test "x$ac_cv_lib_jogl_desktop_glTexParameterf" = xyes; then :
-  JOGL2_LIBS="-ljogl"
+  JOGL2_LIBS="-ljogl_desktop"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl2 -lGL" >&5
-$as_echo "$as_me: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl2 -lGL" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl_desktop -lGL" >&5
+$as_echo "$as_me: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl_desktop -lGL" >&2;}
 fi
 
                    if test -z "$JOGL2_LIBS"; then # The previous test failed add more options to the LDFLAGS
@@ -13739,7 +13749,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13742 "configure"
+// #line 13752 "configure"
 import java.util.regex.Pattern;
 
 import jogamp.common.os.MachineDescriptionRuntime;
@@ -13845,7 +13855,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-r
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen -L/usr/lib64/gluegen"           # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen2 -L/usr/lib64/gluegen2"         # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
                    symbol="Java_jogamp_common_jvm_JVMUtil_initialize"
                    as_ac_Lib=`$as_echo "ac_cv_lib_gluegen2-rt_$symbol" | $as_tr_sh`
@@ -13887,7 +13897,7 @@ eval ac_res=\$$as_ac_Lib
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  GLUEGEN_RT_LIBS="-lgluegen-rt"
+  GLUEGEN2_RT_LIBS="-lgluegen2-rt"
 else
   as_fn_error $? "libgluegen2-rt: Library missing (Cannot find symbol $symbol). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN2 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries." "$LINENO" 5
 fi
@@ -13913,7 +13923,7 @@ $as_echo_n "checking jhall... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13916 "configure"
+// #line 13926 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14030,7 +14040,7 @@ $as_echo_n "checking javahelp2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14033 "configure"
+// #line 14043 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14148,7 +14158,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14151 "configure"
+// #line 14161 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14263,7 +14273,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14266 "configure"
+// #line 14276 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14381,7 +14391,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14384 "configure"
+// #line 14394 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -14487,7 +14497,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14490 "configure"
+// #line 14500 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -14559,7 +14569,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14562 "configure"
+// #line 14572 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -14652,7 +14662,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14655 "configure"
+// #line 14665 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.jeuclid.LayoutContext;
@@ -14771,7 +14781,7 @@ $as_echo_n "checking fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14774 "configure"
+// #line 14784 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.fop.pdf.PDFInfo;
@@ -14888,7 +14898,7 @@ $as_echo_n "checking batik-all... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14891 "configure"
+// #line 14901 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15005,7 +15015,7 @@ $as_echo_n "checking batik... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15008 "configure"
+// #line 15018 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15112,7 +15122,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15115 "configure"
+// #line 15125 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15184,7 +15194,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15187 "configure"
+// #line 15197 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15275,7 +15285,7 @@ $as_echo_n "checking commons-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15278 "configure"
+// #line 15288 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.output.CountingOutputStream;
@@ -15392,7 +15402,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15395 "configure"
+// #line 15405 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.xmlgraphics.util.Service;
@@ -15509,7 +15519,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15512 "configure"
+// #line 15522 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -15626,7 +15636,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15629 "configure"
+// #line 15639 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -15743,7 +15753,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15746 "configure"
+// #line 15756 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -15864,7 +15874,7 @@ $as_echo_n "checking commons-logging... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15867 "configure"
+// #line 15877 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
@@ -15981,7 +15991,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15984 "configure"
+// #line 15994 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16088,7 +16098,7 @@ $as_echo_n "checking minimal version (1.0.0) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 16091 "configure"
+// #line 16101 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16160,7 +16170,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 16163 "configure"
+// #line 16173 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16257,7 +16267,7 @@ $as_echo_n "checking checkstyle... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16260 "configure"
+// #line 16270 "configure"
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -16374,7 +16384,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16377 "configure"
+// #line 16387 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.beanutils.Converter;
@@ -16491,7 +16501,7 @@ $as_echo_n "checking antlr... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16494 "configure"
+// #line 16504 "configure"
 import java.util.regex.Pattern;
 
 import antlr.TokenStreamException;
@@ -16608,7 +16618,7 @@ $as_echo_n "checking junit4... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16611 "configure"
+// #line 16621 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -16725,7 +16735,7 @@ $as_echo_n "checking cobertura... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16728 "configure"
+// #line 16738 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.cobertura.merge.Main;
@@ -16842,7 +16852,7 @@ $as_echo_n "checking asm3... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16845 "configure"
+// #line 16855 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -16958,7 +16968,7 @@ $as_echo_n "checking asm... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16961 "configure"
+// #line 16971 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -23991,6 +24001,293 @@ _ACEOF
 # Gets compilation and library flags
 
 
+#######################
+## Test for CURL
+#######################
+
+
+
+
+
+# Check whether --with-curl was given.
+if test "${with_curl+set}" = set; then :
+  withval=$with_curl; with_curl=$withval
+else
+  with_curl='yes'
+
+fi
+
+
+if test "$with_curl" != 'yes' -a "$with_curl" != 'no'; then
+   # Look if curl-config (which provides cflags and ldflags) is available
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking curl, for curl-config" >&5
+$as_echo_n "checking curl, for curl-config... " >&6; }
+   CURL_FOUND=0
+   CURL_CONFIG="$with_curl/bin/curl-config"
+        if test -x "$CURL_CONFIG"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+$as_echo "$CURL_CONFIG" >&6; }
+                               CURL_FOUND=1
+               fi
+   if test $CURL_FOUND -eq 0; then
+   CURL_CONFIG="$with_curl/curl-config"
+        if test -x "$CURL_CONFIG"; then
+                               CURL_FOUND=1
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+$as_echo "$CURL_CONFIG" >&6; }
+        fi
+   fi
+               if test $CURL_FOUND -eq 0; then
+                as_fn_error $? "Unable to find $CURL_CONFIG. Please check the path you provided" "$LINENO" 5
+               else
+                       unset CURL_FOUND
+               fi
+else
+               for ac_prog in curl-config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CURL_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CURL_CONFIG"; then
+  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CURL_CONFIG="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
+if test -n "$CURL_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+$as_echo "$CURL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$CURL_CONFIG" && break
+done
+test -n "$CURL_CONFIG" || CURL_CONFIG="no"
+
+               if test "x$CURL_CONFIG" = "xno"; then
+                               as_fn_error $? "Unable to find curl-config in the path. Please check your installation of curl (example : libcurl3 & libcurl3-dev with Debian)" "$LINENO" 5
+               fi
+fi
+saved_cflags="$CFLAGS"
+saved_LIBS="$LIBS"
+
+CURL_CFLAGS=`$CURL_CONFIG --cflags`
+CURL_LIBS=`$CURL_CONFIG --libs`
+CURL_VERSION=`$CURL_CONFIG --version`
+
+CURL_REQUIRED_VERSION=7.6
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
+$as_echo_n "checking for CURL... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CURL_CFLAGS"; then
+        pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= \$CURL_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= $CURL_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$CURL_LIBS"; then
+        pkg_cv_CURL_LIBS="$CURL_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= \$CURL_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $CURL_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl >= $CURL_REQUIRED_VERSION"`
+        else
+               CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl >= $CURL_REQUIRED_VERSION"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$CURL_PKG_ERRORS" >&5
+
+       as_fn_error $? "Package requirements (libcurl >= $CURL_REQUIRED_VERSION) were not met:
+
+$CURL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables CURL_CFLAGS
+and CURL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables CURL_CFLAGS
+and CURL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+       CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
+       CURL_LIBS=$pkg_cv_CURL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       :
+fi
+
+LIBS="$CURL_LIBS $LIBS"
+CFLAGS="$CURL_CFLAGS $CFLAGS"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_setopt in -lcurl" >&5
+$as_echo_n "checking for curl_easy_setopt in -lcurl... " >&6; }
+if ${ac_cv_lib_curl_curl_easy_setopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurl  $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 curl_easy_setopt ();
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return curl_easy_setopt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_curl_curl_easy_setopt=yes
+else
+  ac_cv_lib_curl_curl_easy_setopt=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_curl_curl_easy_setopt" >&5
+$as_echo "$ac_cv_lib_curl_curl_easy_setopt" >&6; }
+if test "x$ac_cv_lib_curl_curl_easy_setopt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCURL 1
+_ACEOF
+
+  LIBS="-lcurl $LIBS"
+
+else
+  as_fn_error $? "curl : library missing. (Cannot find symbol curl_easy_setopt). Check if curl is installed and if the version is correct" "$LINENO" 5
+
+fi
+
+
+for ac_header in curl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "curl.h" "ac_cv_header_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CURL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+LIBS="$saved_LIBS"
+CFLAGS="$saved_cflags"
+
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define CURL_CFLAGS "$CURL_CFLAGS"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CURL_LIBS "$CURL_LIBS"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CURL_VERSION "$CURL_VERSION"
+_ACEOF
+
+
+# Gets compilation and library flags
+
+
 #################
 ## Tcl/Tk library
 #################
@@ -24896,7 +25193,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $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 24899 "configure"
+#line 25196 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -25206,7 +25503,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 25209 "configure"
+#line 25506 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25784,7 +26081,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 25787 "configure"
+// #line 26084 "configure"
 import java.util.regex.Pattern;
 
 import com.icl.saxon.Loader;
@@ -25901,7 +26198,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 25904 "configure"
+// #line 26201 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -32305,7 +32602,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 32308 "configure"
+#line 32605 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -32411,7 +32708,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 32414 "configure"
+#line 32711 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -42400,6 +42697,12 @@ echo "  PCRE_CFLAGS ........ = $PCRE_CFLAGS"
 echo "  PCRE_LIBS .......... = $PCRE_LIBS"
 echo "  PCRE_VERSION ....... = $PCRE_VERSION"
 
+echo ""
+echo "CURL configuration:"
+echo "  CURL_CFLAGS ........ = $CURL_CFLAGS"
+echo "  CURL_LIBS .......... = $CURL_LIBS"
+echo "  CURL_VERSION ....... = $CURL_VERSION"
+
 
 echo ""
 echo "SWIG Configuration:"
index a18fe75..e61922b 100644 (file)
@@ -896,9 +896,9 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl -L/usr/lib64/jogl"                 # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl2 -L/usr/lib64/jogl2"               # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
-                   AC_CHECK_LIB([jogl_desktop], [glTexParameterf], [JOGL2_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl_desktop. Will try against -ljogl2 -lGL])])
+                   AC_CHECK_LIB([jogl_desktop], [glTexParameterf], [JOGL2_LIBS="-ljogl_desktop"],[AC_MSG_WARN([Could not link against -ljogl_desktop. Will try against -ljogl_desktop -lGL])])
                    if test -z "$JOGL2_LIBS"; then # The previous test failed add more options to the LDFLAGS
                        # the space after "jogl" in the following line is on
                        # purpose to disable the cache
@@ -925,10 +925,10 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen -L/usr/lib64/gluegen"           # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen2 -L/usr/lib64/gluegen2"         # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
                    symbol="Java_jogamp_common_jvm_JVMUtil_initialize"
-                   AC_CHECK_LIB([gluegen2-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
+                   AC_CHECK_LIB([gluegen2-rt], [$symbol], [GLUEGEN2_RT_LIBS="-lgluegen2-rt"],
                    [AC_MSG_ERROR([libgluegen2-rt: Library missing (Cannot find symbol $symbol). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN2 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],
                    [-ldl])
                    LDFLAGS=$LDFLAGS_save
@@ -1471,6 +1471,12 @@ AM_CONDITIONAL(UMFPACK, test "$with_umfpack" != no)
 
 AC_PCRE()
 
+#######################
+## Test for CURL
+#######################
+
+AC_CURL()
+
 #################
 ## Tcl/Tk library
 #################
@@ -2190,6 +2196,12 @@ echo "  PCRE_CFLAGS ........ = $PCRE_CFLAGS"
 echo "  PCRE_LIBS .......... = $PCRE_LIBS"
 echo "  PCRE_VERSION ....... = $PCRE_VERSION"
 
+echo ""
+echo "CURL configuration:"
+echo "  CURL_CFLAGS ........ = $CURL_CFLAGS"
+echo "  CURL_LIBS .......... = $CURL_LIBS"
+echo "  CURL_VERSION ....... = $CURL_VERSION"
+
 
 echo ""
 echo "SWIG Configuration:"
index c243275..231ae45 100644 (file)
@@ -61,10 +61,11 @@ subdir = contrib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -117,6 +118,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index edf7d2c..681d92d 100644 (file)
@@ -66,10 +66,11 @@ subdir = desktop
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -191,6 +192,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 2445e5a..83bd37c 100644 (file)
@@ -66,10 +66,11 @@ subdir = desktop/images/icons
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -151,6 +152,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 027eaab..0b0752b 100644 (file)
@@ -17,3 +17,4 @@ gl2ps
 Eigen
 *.lib
 Eigen
+curl
\ No newline at end of file
index 1887222..28c449a 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = libs/MALLOC
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -185,6 +186,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index d3081c5..82cd060 100644 (file)
@@ -59,10 +59,11 @@ subdir = libs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -155,6 +156,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 95b5161..1d594f9 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libscidoublylinkedlist_la_include_HEADERS) \
 subdir = libs/doublylinkedlist
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -187,6 +188,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3cd4986..3f80e48 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libscidynamiclibrary_la_include_HEADERS) \
 subdir = libs/dynamiclibrary
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -187,6 +188,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 8feba3d..f2db0f3 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libscihashtable_la_include_HEADERS) \
 subdir = libs/hashtable
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -186,6 +187,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 067b258..b1457a7 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = libs/libst
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -182,6 +183,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
diff --git a/scilab/m4/curl.m4 b/scilab/m4/curl.m4
new file mode 100644 (file)
index 0000000..e8c3ad3
--- /dev/null
@@ -0,0 +1,89 @@
+dnl
+dnl Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+dnl Copyright (C) S/E - 2012 - Sylvestre Ledru
+dnl 
+dnl This file must be used under the terms of the CeCILL.
+dnl This source file is licensed as described in the file COPYING, which
+dnl you should have received as part of this distribution.  The terms
+dnl are also available at    
+dnl http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+dnl
+dnl CURL detection
+dnl
+
+dnl CURL is mandatory in Scilab 
+dnl When we check :
+dnl * if the path is provided or that we have to find it ourself
+dnl * if it is available
+dnl * what are the compilation flags 
+dnl * what are linking flags
+AC_DEFUN([AC_CURL], [
+
+
+AC_ARG_WITH(curl,
+               AC_HELP_STRING([--with-curl=DIR],[Set the path to your CURL installation]),
+               [with_curl=$withval],
+               [with_curl='yes']
+               )
+
+if test "$with_curl" != 'yes' -a "$with_curl" != 'no'; then
+   # Look if curl-config (which provides cflags and ldflags) is available
+   AC_MSG_CHECKING([curl, for curl-config])
+   CURL_FOUND=0
+   CURL_CONFIG="$with_curl/bin/curl-config" 
+        if test -x "$CURL_CONFIG"; then
+                AC_MSG_RESULT([$CURL_CONFIG])
+                               CURL_FOUND=1
+               fi
+   if test $CURL_FOUND -eq 0; then
+   CURL_CONFIG="$with_curl/curl-config" 
+        if test -x "$CURL_CONFIG"; then
+                               CURL_FOUND=1
+                AC_MSG_RESULT([$CURL_CONFIG])
+        fi
+   fi
+               if test $CURL_FOUND -eq 0; then
+                AC_MSG_ERROR([Unable to find $CURL_CONFIG. Please check the path you provided])
+               else
+                       unset CURL_FOUND
+               fi
+else
+               AC_CHECK_PROGS(CURL_CONFIG,curl-config,no)
+               if test "x$CURL_CONFIG" = "xno"; then
+                               AC_MSG_ERROR([Unable to find curl-config in the path. Please check your installation of curl (example : libcurl3 & libcurl3-dev with Debian)])
+               fi
+fi
+saved_cflags="$CFLAGS"
+saved_LIBS="$LIBS"
+
+CURL_CFLAGS=`$CURL_CONFIG --cflags`
+CURL_LIBS=`$CURL_CONFIG --libs`
+CURL_VERSION=`$CURL_CONFIG --version`
+
+CURL_REQUIRED_VERSION=7.6
+    PKG_CHECK_MODULES(CURL,
+                      libcurl >= $CURL_REQUIRED_VERSION)
+
+LIBS="$CURL_LIBS $LIBS"
+CFLAGS="$CURL_CFLAGS $CFLAGS"
+
+AC_CHECK_LIB([curl], [curl_easy_setopt],
+               [],
+               [AC_MSG_ERROR([curl : library missing. (Cannot find symbol curl_easy_setopt). Check if curl is installed and if the version is correct])]
+               )
+
+AC_CHECK_HEADERS([curl.h])
+
+LIBS="$saved_LIBS"
+CFLAGS="$saved_cflags"
+
+AC_SUBST(CURL_CFLAGS)
+AC_SUBST(CURL_LIBS)
+AC_SUBST(CURL_VERSION)
+
+AC_DEFINE_UNQUOTED([CURL_CFLAGS],["$CURL_CFLAGS"],[CURL flags])
+AC_DEFINE_UNQUOTED([CURL_LIBS],["$CURL_LIBS"],[CURL library])
+AC_DEFINE_UNQUOTED([CURL_VERSION],["$CURL_VERSION"],[CURL version])
+
+# Gets compilation and library flags
+])
index 10dcce4..751702c 100644 (file)
@@ -79,10 +79,11 @@ subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -242,6 +243,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 1708174..4a96e43 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/action_binding
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -234,6 +235,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 0811f5c..6d18657 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(libsciapi_scilab_la_include_HEADERS) \
 subdir = modules/api_scilab
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -207,6 +208,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 636499c..adc6eaf 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/arnoldi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -198,6 +199,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index ce11e4f..4b14faa 100644 (file)
@@ -82,10 +82,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/atoms
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -170,6 +171,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index f3c311f..9893b72 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/boolean
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -210,6 +211,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 6a1f162..c3d810a 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/cacsd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -247,6 +248,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index d8ed66f..1147104 100644 (file)
@@ -81,10 +81,11 @@ DIST_COMMON = $(libscicall_scilab_la_include_HEADERS) \
 subdir = modules/call_scilab
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -205,6 +206,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 2fc1d16..35b0eb0 100644 (file)
@@ -89,10 +89,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/commons
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -230,6 +231,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 1c2783f..a227562 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/compatibility_functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -167,6 +168,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 9770934..f435222 100644 (file)
@@ -85,10 +85,11 @@ DIST_COMMON = $(libscicompletion_la_include_HEADERS) \
 subdir = modules/completion
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -239,6 +240,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 2cb407b..68c3909 100644 (file)
@@ -97,10 +97,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/console
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -296,6 +297,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index bd85446..e49ba70 100644 (file)
@@ -91,10 +91,11 @@ DIST_COMMON = $(libscicore_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = modules/core
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -431,6 +432,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index c08feab..b2f142d 100644 (file)
 /* Cname */
 #undef CNAME
 
+/* CURL flags */
+#undef CURL_CFLAGS
+
+/* CURL library */
+#undef CURL_LIBS
+
+/* CURL version */
+#undef CURL_VERSION
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -60,6 +69,9 @@
 /* HAVE_CPLUS_DEMANGLE */
 #undef HAVE_CPLUS_DEMANGLE
 
+/* Define to 1 if you have the <curl.h> header file. */
+#undef HAVE_CURL_H
+
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
 /* Define to 1 if you have the `iswprint' function. */
 #undef HAVE_ISWPRINT
 
+/* Define to 1 if you have the `curl' library (-lcurl). */
+#undef HAVE_LIBCURL
+
 /* Define to 1 if you have the `curses' library (-lcurses). */
 #undef HAVE_LIBCURSES
 
index 7d15502..493e4af 100644 (file)
@@ -81,10 +81,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/data_structures
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -245,6 +246,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 86f7cf7..12554d0 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/demo_tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -166,6 +167,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 66bcd99..238b616 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/development_tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -167,6 +168,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index dfd963d..55ec583 100644 (file)
@@ -54,10 +54,11 @@ subdir = modules/development_tools/src/fake
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -110,6 +111,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 5e7bc94..53e1896 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/differential_equations
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -252,6 +253,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 8f8d485..c94a2b8 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/double
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -199,6 +200,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index cbb45fb..38a15c6 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/dynamic_link
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -225,6 +226,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index c84c0e1..2acc806 100644 (file)
@@ -81,10 +81,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/elementary_functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -345,6 +346,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 7889d35..de5d0aa 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(libsciexternal_objects_la_include_HEADERS) \
 subdir = modules/external_objects
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -299,6 +300,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 7fb0282..cc6ed1c 100644 (file)
@@ -85,10 +85,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/fftw
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -242,6 +243,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 688ad5b..d02abf3 100644 (file)
@@ -55,7 +55,8 @@ src/c/getFullFilename.c \
 src/c/mputl.c \
 src/c/fscanfMat.c \
 src/c/fprintfMat.c \
-src/c/createtempfilename.c
+src/c/createtempfilename.c \
+src/c/dlManager.c
 
 
 GATEWAY_SOURCES = \
@@ -104,7 +105,10 @@ 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_tempname.c \
+sci_gateway/c/sci_getURL.c \
+sci_gateway/c/sci_getURLcontent.c \
+sci_gateway/c/sci_splitURL.c
 
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
@@ -115,6 +119,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
+                           $(XML_FLAGS) \
                                $(AM_CPPFLAGS)
 
 if MAINTAINER_MODE
@@ -129,6 +134,7 @@ endif
 libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
 libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CXX_SOURCES)
 libscifileio_algo_la_CPPFLAGS = $(libscifileio_la_CPPFLAGS)
+libscifileio_algo_la_LDFLAGS = $(CURL_LIBS)
 
 # For the code check (splint)
 CHECK_SRC= $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
index ef33596..020ea40 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = modules/fileio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -178,9 +179,13 @@ am__objects_1 = libscifileio_algo_la-FileExist.lo \
        libscifileio_algo_la-mputl.lo \
        libscifileio_algo_la-fscanfMat.lo \
        libscifileio_algo_la-fprintfMat.lo \
-       libscifileio_algo_la-createtempfilename.lo
+       libscifileio_algo_la-createtempfilename.lo \
+       libscifileio_algo_la-dlManager.lo
 am_libscifileio_algo_la_OBJECTS = $(am__objects_1)
 libscifileio_algo_la_OBJECTS = $(am_libscifileio_algo_la_OBJECTS)
+libscifileio_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libscifileio_algo_la_LDFLAGS) $(LDFLAGS) -o $@
 @MAINTAINER_MODE_FALSE@am_libscifileio_algo_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libscifileio_algo_la_rpath =
 libscifileio_la_DEPENDENCIES = libscifileio-algo.la
@@ -216,7 +221,9 @@ am__objects_2 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_basename.lo \
        libscifileio_la-sci_pathconvert.lo \
        libscifileio_la-sci_isfile.lo libscifileio_la-sci_mputl.lo \
-       libscifileio_la-sci_tempname.lo
+       libscifileio_la-sci_tempname.lo libscifileio_la-sci_getURL.lo \
+       libscifileio_la-sci_getURLcontent.lo \
+       libscifileio_la-sci_splitURL.lo
 am_libscifileio_la_OBJECTS = $(am__objects_2)
 libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS)
 @MAINTAINER_MODE_FALSE@am_libscifileio_la_rpath =
@@ -275,6 +282,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -552,7 +563,8 @@ src/c/getFullFilename.c \
 src/c/mputl.c \
 src/c/fscanfMat.c \
 src/c/fprintfMat.c \
-src/c/createtempfilename.c
+src/c/createtempfilename.c \
+src/c/dlManager.c
 
 GATEWAY_SOURCES = \
 sci_gateway/c/gw_fileio.c \
@@ -600,7 +612,10 @@ 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_tempname.c \
+sci_gateway/c/sci_getURL.c \
+sci_gateway/c/sci_getURLcontent.c \
+sci_gateway/c/sci_splitURL.c
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
@@ -610,6 +625,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
+                           $(XML_FLAGS) \
                                $(AM_CPPFLAGS)
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscifileio.la
@@ -618,6 +634,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
 libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
 libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CXX_SOURCES)
 libscifileio_algo_la_CPPFLAGS = $(libscifileio_la_CPPFLAGS)
+libscifileio_algo_la_LDFLAGS = $(CURL_LIBS)
 
 # For the code check (splint)
 CHECK_SRC = $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
@@ -796,7 +813,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscifileio-algo.la: $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_DEPENDENCIES) $(EXTRA_libscifileio_algo_la_DEPENDENCIES) 
-       $(LINK) $(am_libscifileio_algo_la_rpath) $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_LIBADD) $(LIBS)
+       $(libscifileio_algo_la_LINK) $(am_libscifileio_algo_la_rpath) $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_LIBADD) $(LIBS)
 libscifileio.la: $(libscifileio_la_OBJECTS) $(libscifileio_la_DEPENDENCIES) $(EXTRA_libscifileio_la_DEPENDENCIES) 
        $(LINK) $(am_libscifileio_la_rpath) $(libscifileio_la_OBJECTS) $(libscifileio_la_LIBADD) $(LIBS)
 
@@ -818,6 +835,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-createtempfilename.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-deleteafile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-delfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-dlManager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-do_xxscanf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-expandPathVariable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-fileinfo.Plo@am__quote@
@@ -872,6 +890,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fprintfMat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fscanfMat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fullpath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getURL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getURLcontent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_get_absolute_file_path.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getdrives.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getlongpathname.Plo@am__quote@
@@ -903,6 +923,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_pathsep.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_pwd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_removedir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_splitURL.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_tempname.Plo@am__quote@
 
 .c.o:
@@ -1290,6 +1311,13 @@ libscifileio_algo_la-createtempfilename.lo: src/c/createtempfilename.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-createtempfilename.lo `test -f 'src/c/createtempfilename.c' || echo '$(srcdir)/'`src/c/createtempfilename.c
 
+libscifileio_algo_la-dlManager.lo: src/c/dlManager.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-dlManager.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-dlManager.Tpo -c -o libscifileio_algo_la-dlManager.lo `test -f 'src/c/dlManager.c' || echo '$(srcdir)/'`src/c/dlManager.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-dlManager.Tpo $(DEPDIR)/libscifileio_algo_la-dlManager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/dlManager.c' object='libscifileio_algo_la-dlManager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-dlManager.lo `test -f 'src/c/dlManager.c' || echo '$(srcdir)/'`src/c/dlManager.c
+
 libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_la-gw_fileio.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-gw_fileio.Tpo $(DEPDIR)/libscifileio_la-gw_fileio.Plo
@@ -1612,6 +1640,27 @@ libscifileio_la-sci_tempname.lo: sci_gateway/c/sci_tempname.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_tempname.lo `test -f 'sci_gateway/c/sci_tempname.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tempname.c
 
+libscifileio_la-sci_getURL.lo: sci_gateway/c/sci_getURL.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_getURL.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_getURL.Tpo -c -o libscifileio_la-sci_getURL.lo `test -f 'sci_gateway/c/sci_getURL.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getURL.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_getURL.Tpo $(DEPDIR)/libscifileio_la-sci_getURL.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_getURL.c' object='libscifileio_la-sci_getURL.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_getURL.lo `test -f 'sci_gateway/c/sci_getURL.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getURL.c
+
+libscifileio_la-sci_getURLcontent.lo: sci_gateway/c/sci_getURLcontent.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_getURLcontent.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_getURLcontent.Tpo -c -o libscifileio_la-sci_getURLcontent.lo `test -f 'sci_gateway/c/sci_getURLcontent.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getURLcontent.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_getURLcontent.Tpo $(DEPDIR)/libscifileio_la-sci_getURLcontent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_getURLcontent.c' object='libscifileio_la-sci_getURLcontent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_getURLcontent.lo `test -f 'sci_gateway/c/sci_getURLcontent.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getURLcontent.c
+
+libscifileio_la-sci_splitURL.lo: sci_gateway/c/sci_splitURL.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_splitURL.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_splitURL.Tpo -c -o libscifileio_la-sci_splitURL.lo `test -f 'sci_gateway/c/sci_splitURL.c' || echo '$(srcdir)/'`sci_gateway/c/sci_splitURL.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_splitURL.Tpo $(DEPDIR)/libscifileio_la-sci_splitURL.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_splitURL.c' object='libscifileio_la-sci_splitURL.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_splitURL.lo `test -f 'sci_gateway/c/sci_splitURL.c' || echo '$(srcdir)/'`sci_gateway/c/sci_splitURL.c
+
 mostlyclean-libtool:
        -rm -f *.lo
 
index fbbaedc..f8653ca 100644 (file)
@@ -28,4 +28,6 @@ getScilabMode
 overload_
 xscion_
 getwsmat_
-
+getOSRelease
+getOSFullName
+getSCIHOME
\ No newline at end of file
index f9bc067..4d3aee2 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -106,7 +106,7 @@ lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -134,7 +134,7 @@ lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -170,7 +170,7 @@ lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../../libs/curl/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -200,6 +200,9 @@ lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="sci_gateway\c\sci_getURL.c" />
+    <ClCompile Include="sci_gateway\c\sci_getURLcontent.c" />
+    <ClCompile Include="sci_gateway\c\sci_splitURL.c" />
     <ClCompile Include="sci_gateway\c\sci_tempname.c" />
     <ClCompile Include="src\c\addfile.c" />
     <ClCompile Include="src\c\basename.c" />
@@ -210,6 +213,7 @@ lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
     <ClCompile Include="src\c\deleteafile.c" />
     <ClCompile Include="src\c\delfile.c" />
     <ClCompile Include="src\c\DllmainFileio.c" />
+    <ClCompile Include="src\c\dlManager.c" />
     <ClCompile Include="src\c\do_xxscanf.c" />
     <ClCompile Include="src\c\expandPathVariable.c" />
     <ClCompile Include="src\c\FileExist.c" />
index 256153b..089700d 100644 (file)
     <ClCompile Include="sci_gateway\c\sci_tempname.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sci_gateway\c\sci_getURL.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\c\sci_getURLcontent.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\c\sci_splitURL.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\dlManager.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\addfile.h">
diff --git a/scilab/modules/fileio/help/en_US/getURL.xml b/scilab/modules/fileio/help/en_US/getURL.xml
new file mode 100644 (file)
index 0000000..acf725e
--- /dev/null
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) - S/E - Sylvestre Ledru
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+<refentry xml:id="getURL" xml:lang="en"
+          xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:scilab="http://www.scilab.org"
+          xmlns:db="http://docbook.org/ns/docbook">
+    
+    <refnamediv>
+        <refname>getURL</refname>
+        
+        <refpurpose>Download an URL (HTTP, HTTPS, FTP...) </refpurpose>
+    </refnamediv>
+    
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        
+        <synopsis>filename = getURL(URL);
+            filename = getURL(URL [, targetDir [, username [, password]]]]);
+            filename = getURL(URL [, targetFile [, username [, password]]]]);
+        </synopsis>
+    </refsynopsisdiv>
+    
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>URL</term>
+                <listitem>
+                    <para>String: An URL. Supported and tested: HTTP, HTTPS, FTP (IPv4 and IPv6)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>targetDir</term>
+                <listitem>
+                    <para>String optional parameter: In which directory the file will be stored (current directory if empty)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>targetFile</term>
+                <listitem>
+                    <para>String optional parameter: Where (and under which name) the file will be stored (current directory if empty)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>username</term>
+                <listitem>
+                    <para>String optional parameter: Username for the websites which require authentication</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>password</term>
+                <listitem>
+                    <para>String optional parameter: Password for the websites which require authentication</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>filename</term>
+                <listitem>
+                    <para>String: The path to the downloaded file</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    
+    <refsection>
+        <title>Description</title>
+        
+        <para>Download a file from an URL</para>
+        
+        <para>
+            getURL will download a file from a remote URL. By default, getURL will use the same name as provided in the URL. However, under some circumstances (for example, <emphasis role="italic">http://www.scilab.org/</emphasis>), the filename is not provided by the URL itself, getURL will rename the file to <emphasis role="italic">index.html</emphasis>
+        </para>
+        
+        <para>
+            This function is based on the <ulink url="http://curl.haxx.se/libcurl/">curl library</ulink>.
+        </para>
+        
+        <para> Username and Password can be specified for the websites which required authentication. The authentication method used is the CURLAUTH_ANY provided by CURLOPT_HTTPAUTH parameter of the libcurl library.</para>
+        
+        <para>IPv6 (and obviously IPv4) are supported out-of-the box by getURL.</para>
+        
+        <para>Proxy configuration is enabled in this version. It uses the parameters from ATOMS config file.</para>
+        
+        <para>
+            The <emphasis role="italic">CURLOPT_FOLLOWLOCATION</emphasis> curl option is activated to make sure the download follow the URL.
+        </para>
+        
+        <para>
+            Due to the fact that getURL is based on libcurl, it is likely that <ulink url="http://curl.haxx.se/docs/features.html">other protocols</ulink> than HTTP, HTTPS and FTPS will work. However, they have not been tested enough.
+        </para>
+        
+    </refsection>
+    
+    <refsection>
+        <title>Examples</title>
+        
+        <programlisting role="example">
+            
+            // Will download the URL and name the file maths_simulation
+            getURL("http://www.scilab.org/products/scilab/features/maths_simulation");
+            
+            // Save the Scilab homepage in the current directory (and rename the file)
+            getURL("http://www.scilab.org","scilab_homepage.html");
+            
+            // Download a Scilab example and execute it
+            myFile = getURL("http://fileexchange.scilab.org/toolboxes/contour3d/10.03/files/contour3d.sci",TMPDIR)
+            exec(myFile);
+            contour3d();
+            
+            // Use authentication
+            getURL("http://http://httpbin.org/basic-auth/user/passwd",TMPDIR+"/testfile.html","user","passwd")
+            
+            // Needs IPv6 connectivity
+            getURL("http://ipv6.google.com/intl/en_com/images/srpr/logo3w.png")
+            
+        </programlisting>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="getURLcontent">getURLcontent</link>
+            </member>
+            <member>
+                <link linkend="splitURL">splitURL</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/fileio/help/en_US/getURLcontent.xml b/scilab/modules/fileio/help/en_US/getURLcontent.xml
new file mode 100644 (file)
index 0000000..807bc1b
--- /dev/null
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) - S/E - Sylvestre Ledru
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+<refentry xml:id="getURLcontent" xml:lang="en"
+          xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:scilab="http://www.scilab.org"
+          xmlns:db="http://docbook.org/ns/docbook">
+    
+    <refnamediv>
+        <refname>getURLcontent</refname>
+        
+        <refpurpose>Return the content of an URL (HTTP, HTTPS, FTP...) </refpurpose>
+    </refnamediv>
+    
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        
+        <synopsis>output = getURLcontent(URL [, username, [, password]]);
+        </synopsis>
+    </refsynopsisdiv>
+    
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>URL</term>
+                <listitem>
+                    <para>String: An URL. Supported and tested: HTTP, HTTPS, FTP (IPv4 and IPv6)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>username</term>
+                <listitem>
+                    <para>String optional parameter: Username for the websites which require authentication</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>password</term>
+                <listitem>
+                    <para>String optional parameter: Password for the websites which require authentication</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>output</term>
+                <listitem>
+                    <para>String: containing the content pointed by the URL</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    
+    <refsection>
+        <title>Description</title>
+        
+        <para>Retrieve the content of a page pointed by an URL</para>
+        
+        <para>getURLcontent will download the content of remote URL.</para>
+        
+        <para>
+            This function is based on the <ulink url="http://curl.haxx.se/libcurl/">curl library</ulink>.
+        </para>
+        
+        <para> Username and Password can be specified for the websites which required authentication. The authentication method used is the CURLAUTH_ANY provided by CURLOPT_HTTPAUTH parameter of the libcurl library.</para>
+        
+        <para>IPv6 (and obviously IPv4) are supported out-of-the box by getURLcontent.</para>
+        
+        <para>Proxy configuration is enabled in this version. It uses the ATOMS proxy parameters.</para>
+        
+        <para>
+            The <emphasis role="italic">CURLOPT_FOLLOWLOCATION</emphasis> curl option is activated to make sure the download follow the URL.
+        </para>
+        
+        <para>
+            Due to the fact that getURLcontent is based on libcurl, it is likely that <ulink url="http://curl.haxx.se/docs/features.html">other protocols</ulink> than HTTP, HTTPS and FTPS will work. However, they have not been tested enough.
+        </para>
+        
+    </refsection>
+    
+    <refsection>
+        <title>Examples</title>
+        
+        <programlisting role="example">
+            // Get the content of google homepage with HTTPS
+            getURLcontent("https://encrypted.google.com")
+            
+            
+            // Download a readme file from a ftp
+            getURLcontent("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README")
+            
+            // Use authentication
+            getURLcontent("http://httpbin.org/basic-auth/user/passwd","user","passwd")
+            
+            getURLcontent("http://fileexchange.scilab.org/toolboxes/161000/1.0/files/cshift.sci")
+        </programlisting>
+        <!-- 
+// This example fails for now (probably a bug on evstr)
+// Retrieve the content and execute it
+content=getURLcontent("http://fileexchange.scilab.org/toolboxes/161000/1.0/files/cshift.sci")
+evstr(content);
+M = grand(3,4,"uin",0,9);
+cshift(M,1);
+-->
+        
+    </refsection>
+    
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="getURL">getURL</link>
+            </member>
+            <member>
+                <link linkend="splitURL">splitURL</link>
+            </member>
+        </simplelist>
+    </refsection>
+    
+</refentry>
diff --git a/scilab/modules/fileio/help/en_US/splitURL.xml b/scilab/modules/fileio/help/en_US/splitURL.xml
new file mode 100644 (file)
index 0000000..5f50b8c
--- /dev/null
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) - S/E - Sylvestre Ledru
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+<refentry xml:id="splitURL" xml:lang="en"
+          xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:scilab="http://www.scilab.org"
+          xmlns:db="http://docbook.org/ns/docbook">
+    
+    <refnamediv>
+        <refname>splitURL</refname>
+        
+        <refpurpose>Split an URL (HTTP, HTTPS, FTP...) </refpurpose>
+    </refnamediv>
+    
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        
+        <synopsis>[proto, server, path, query, username, port, fragment] = splitURL(URL);
+        </synopsis>
+    </refsynopsisdiv>
+    
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>URL</term>
+                <listitem>
+                    <para>String: An URL. Supported and tested: HTTP, HTTPS, FTP (IPv4 and IPv6)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>proto</term>
+                <listitem>
+                    <para>
+                        String: the protocol (ex: <emphasis role="italic">http, ftp, etc</emphasis>)
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>server</term>
+                <listitem>
+                    <para>
+                        String: the server (ex: <emphasis role="italic">www.scilab.org</emphasis>)
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>path</term>
+                <listitem>
+                    <para>
+                        String: the path (ex: <emphasis role="italic">/products/scilab</emphasis>)
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>query</term>
+                <listitem>
+                    <para>
+                        String: query (ex: <emphasis role="italic">?SearchText=plot3d</emphasis>)
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>username</term>
+                <listitem>
+                    <para>
+                        String: username (ex: <emphasis role="italic">username:pass</emphasis>)
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>port</term>
+                <listitem>
+                    <para>
+                        int: port (ex: <emphasis role="italic">80</emphasis>)
+                    </para>
+                    <para>Note that if the port is not provided in the URL, the value will be 0.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>fragment</term>
+                <listitem>
+                    <para>
+                        String: fragment (ex: <emphasis role="italic">#chapter1</emphasis>)
+                    </para>
+                    <para>The fragment is also called anchor and it is used to create a bookmark inside an HTML document.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    
+    <refsection>
+        <title>Description</title>
+        
+        <para>Split an URL by component </para>
+        
+        <para>
+            This function is based on the <ulink url="http://xmlsoft.org/html/libxml-uri.html#xmlParseURI">libxml2 library (in particular, the function xmlParseURI)</ulink>.
+        </para>
+        
+    </refsection>
+    
+    <refsection>
+        <title>Examples</title>
+        
+        <programlisting role="example">
+            [proto, server, path, query, username, port, fragment] = splitURL("http://xmlsoft.org/html/libxml-uri.html#xmlParseURI")
+            
+            [proto, server, path] = splitURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README")
+            
+            [a,b,c,d]=splitURL("http://www.scilab.org/content/search?SearchText=plot")
+            
+        </programlisting>
+        <!-- 
+// This example fails for now (probably a bug on evstr)
+// Retrieve the content and execute it
+content=getURLcontent("http://fileexchange.scilab.org/toolboxes/161000/1.0/files/cshift.sci")
+evstr(content);
+M = grand(3,4,"uin",0,9);
+cshift(M,1);
+-->
+        
+    </refsection>
+    
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="getURL">getURL</link>
+            </member>
+            <member>
+                <link linkend="getURLcontent">getURLcontent</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
index 1611746..c5a8c18 100644 (file)
@@ -1,66 +1,69 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - INRIA - Allan CORNET
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 #ifndef __GW_FILEIO_H__
 #define __GW_FILEIO_H__
 #include "dynlib_fileio.h"
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 FILEIO_IMPEXP int gw_fileio(void);
-/*--------------------------------------------------------------------------*/ 
-int sci_meof(char *fname,unsigned long fname_len);
-int sci_mopen(char *fname,unsigned long fname_len);
-int sci_mclose(char *fname,unsigned long fname_len);
-int sci_merror(char *fname,unsigned long fname_len);
-int sci_mputstr(char *fname,unsigned long fname_len);
-int sci_mput(char *fname,unsigned long fname_len);
-int sci_mget(char *fname,unsigned long fname_len);
-int sci_mgetstr(char *fname,unsigned long fname_len);
-int sci_mseek(char *fname,unsigned long fname_len);
-int sci_mtell(char *fname,unsigned long fname_len);
-int sci_mclearerr(char *fname,unsigned long fname_len);
-int sci_fscanfMat(char *fname,unsigned long fname_len);
-int sci_mfprintf(char *fname,unsigned long fname_len);
-int sci_scanf(char *fname,unsigned long fname_len);
-int sci_fprintfMat(char *fname,unsigned long fname_len);
-int sci_sscanf(char *fname,unsigned long fname_len);
-int sci_fscanf(char *fname,unsigned long fname_len);
-int sci_findfiles(char *fname,unsigned long fname_len);
-int sci_maxfiles(char *fname,unsigned long fname_len);
-int sci_getdrives(char *fname,unsigned long fname_len);
-int sci_fullpath(char *fname,unsigned long fname_len);
-int sci_deletefile(char *fname,unsigned long fname_len);
-int sci_pathsep(char *fname,unsigned long fname_len);
-int sci_filesep(char *fname,unsigned long fname_len);
-int sci_getlongpathname(char *fname,unsigned long fname_len);
-int sci_getshortpathname(char *fname,unsigned long fname_len);
-int sci_fileext(char *fname,unsigned long fname_len);
-int sci_isdir(char *fname,unsigned long fname_len);
-int sci_createdir(char *fname,unsigned long fname_len);
-int sci_removedir(char *fname,unsigned long fname_len);
-int sci_chdir(char *fname,unsigned long fname_len);
-int sci_pwd(char *fname,unsigned long fname_len);
-int sci_fileinfo(char *fname,unsigned long fname_len);
-int sci_newest(char *fname,unsigned long fname_len);
+/*--------------------------------------------------------------------------*/
+int sci_meof(char *fname, unsigned long fname_len);
+int sci_mopen(char *fname, unsigned long fname_len);
+int sci_mclose(char *fname, unsigned long fname_len);
+int sci_merror(char *fname, unsigned long fname_len);
+int sci_mputstr(char *fname, unsigned long fname_len);
+int sci_mput(char *fname, unsigned long fname_len);
+int sci_mget(char *fname, unsigned long fname_len);
+int sci_mgetstr(char *fname, unsigned long fname_len);
+int sci_mseek(char *fname, unsigned long fname_len);
+int sci_mtell(char *fname, unsigned long fname_len);
+int sci_mclearerr(char *fname, unsigned long fname_len);
+int sci_fscanfMat(char *fname, unsigned long fname_len);
+int sci_mfprintf(char *fname, unsigned long fname_len);
+int sci_scanf(char *fname, unsigned long fname_len);
+int sci_fprintfMat(char *fname, unsigned long fname_len);
+int sci_sscanf(char *fname, unsigned long fname_len);
+int sci_fscanf(char *fname, unsigned long fname_len);
+int sci_findfiles(char *fname, unsigned long fname_len);
+int sci_maxfiles(char *fname, unsigned long fname_len);
+int sci_getdrives(char *fname, unsigned long fname_len);
+int sci_fullpath(char *fname, unsigned long fname_len);
+int sci_deletefile(char *fname, unsigned long fname_len);
+int sci_pathsep(char *fname, unsigned long fname_len);
+int sci_filesep(char *fname, unsigned long fname_len);
+int sci_getlongpathname(char *fname, unsigned long fname_len);
+int sci_getshortpathname(char *fname, unsigned long fname_len);
+int sci_fileext(char *fname, unsigned long fname_len);
+int sci_isdir(char *fname, unsigned long fname_len);
+int sci_createdir(char *fname, unsigned long fname_len);
+int sci_removedir(char *fname, unsigned long fname_len);
+int sci_chdir(char *fname, unsigned long fname_len);
+int sci_pwd(char *fname, unsigned long fname_len);
+int sci_fileinfo(char *fname, unsigned long fname_len);
+int sci_newest(char *fname, unsigned long fname_len);
 int sci_getrelativefilename(char *fname, unsigned long l);
-int sci_get_absolute_file_path(char *fname,unsigned long fname_len);
-int sci_copyfile(char *fname,unsigned long fname_len);
-int sci_isfile(char *fname,unsigned long fname_len);
-int sci_fileparts(char *fname,unsigned long fname_len);
-int sci_movefile(char *fname,unsigned long fname_len);
-int sci_basename(char *fname,unsigned long fname_len);
-int sci_pathconvert(char *fname,unsigned long fname_len);
-int sci_mgetl(char *fname,unsigned long fname_len);
-int sci_mputl(char *fname,unsigned long fname_len);
-int sci_tempname(char *fname,unsigned long fname_len);
-/*--------------------------------------------------------------------------*/ 
+int sci_get_absolute_file_path(char *fname, unsigned long fname_len);
+int sci_copyfile(char *fname, unsigned long fname_len);
+int sci_isfile(char *fname, unsigned long fname_len);
+int sci_fileparts(char *fname, unsigned long fname_len);
+int sci_movefile(char *fname, unsigned long fname_len);
+int sci_basename(char *fname, unsigned long fname_len);
+int sci_pathconvert(char *fname, unsigned long fname_len);
+int sci_mgetl(char *fname, unsigned long fname_len);
+int sci_mputl(char *fname, unsigned long fname_len);
+int sci_tempname(char *fname, unsigned long fname_len);
+int sci_getURL(char *fname, unsigned long fname_len);
+int sci_getURLcontent(char *fname, unsigned long fname_len);
+int sci_splitURL(char *fname, unsigned long fname_len);
+/*--------------------------------------------------------------------------*/
 #endif /* __GW_FILEIO_H__ */
 /*--------------------------------------------------------------------------*/
index 4283bfd..eafdaca 100644 (file)
@@ -9,3 +9,17 @@ This module file is licensed as described in the file COPYING, which
 you should have received as part of this distribution.  The terms
 are also available at
 http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+======================
+
+The function 
+size_t writefunc(void *ptr, size_t size, size_t nmemb, struct string *s)
+written by Alexandre Jasmin has been copied and paste from stackoverflow:
+http://stackoverflow.com/questions/2329571/c-libcurl-get-output-into-a-string
+
+published under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license:
+You are free:
+    to Share - to copy, distribute and transmit the work
+    to Remix - to adapt the work
+    to make commercial use of the work
+
index 508e93c..230e885 100644 (file)
@@ -2,11 +2,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - INRIA - Allan CORNET
  * Copyright (C) 2010 - DIGITEO - Allan CORNET
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
 #include "callFunctionFromGateway.h"
 #include "MALLOC.h"
 #include "api_scilab.h"
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 /*  interface function */
-/*--------------------------------------------------------------------------*/ 
-static gw_generic_table Tab[]={
+/*--------------------------------------------------------------------------*/
+static gw_generic_table Tab[] =
+{
     {sci_mopen, "mopen"},
     {sci_mputstr, "mputstr"},
     {sci_mclose, "mclose"},
@@ -29,56 +30,59 @@ static gw_generic_table Tab[]={
     {sci_mseek, "mseek"},
     {sci_mtell, "mtell"},
     {sci_mclearerr, "mclearerr"},
-    {sci_mfprintf,"mfprintf"},
-    {sci_scanf,"mscanf"},
-    {sci_fscanf,"mfscanf"},
-    {sci_sscanf,"msscanf"},
-    {sci_fscanfMat,"fscanfMat"},
-    {sci_fprintfMat,"fprintfMat"},
+    {sci_mfprintf, "mfprintf"},
+    {sci_scanf, "mscanf"},
+    {sci_fscanf, "mfscanf"},
+    {sci_sscanf, "msscanf"},
+    {sci_fscanfMat, "fscanfMat"},
+    {sci_fprintfMat, "fprintfMat"},
     {sci_merror, "merror"},
-    {sci_findfiles,"findfiles"},
-    {sci_maxfiles,"maxfiles"},
-    {sci_getdrives,"getdrives"},
-    {sci_fullpath,"fullpath"},
-    {sci_deletefile,"deletefile"},
-    {sci_pathsep,"pathsep"},
-    {sci_filesep,"filesep"},
-    {sci_getlongpathname,"getlongpathname"},
-    {sci_getshortpathname,"getshortpathname"},
-    {sci_fileext,"fileext"},
-    {sci_isdir,"isdir"},
-    {sci_removedir,"removedir"},
-    {sci_createdir,"createdir"},
-    {sci_pwd,"pwd"},
-    {sci_chdir,"chdir"},
-    {sci_fileinfo,"fileinfo"},
-    {sci_newest,"newest"},
-    {sci_getrelativefilename,"getrelativefilename"},
-    {sci_get_absolute_file_path,"get_absolute_file_path"},
-    {sci_copyfile,"copyfile"},
-    {sci_isfile,"isfile"},
-    {sci_fileparts,"fileparts"},
-    {sci_movefile,"movefile"},
-    {sci_basename,"basename"},
-    {sci_pathconvert,"pathconvert"},
-    {sci_chdir,"cd"},
-    {sci_mgetl,"mgetl"},
-    {sci_mputl,"mputl"},
-    {sci_tempname,"tempname"}
+    {sci_findfiles, "findfiles"},
+    {sci_maxfiles, "maxfiles"},
+    {sci_getdrives, "getdrives"},
+    {sci_fullpath, "fullpath"},
+    {sci_deletefile, "deletefile"},
+    {sci_pathsep, "pathsep"},
+    {sci_filesep, "filesep"},
+    {sci_getlongpathname, "getlongpathname"},
+    {sci_getshortpathname, "getshortpathname"},
+    {sci_fileext, "fileext"},
+    {sci_isdir, "isdir"},
+    {sci_removedir, "removedir"},
+    {sci_createdir, "createdir"},
+    {sci_pwd, "pwd"},
+    {sci_chdir, "chdir"},
+    {sci_fileinfo, "fileinfo"},
+    {sci_newest, "newest"},
+    {sci_getrelativefilename, "getrelativefilename"},
+    {sci_get_absolute_file_path, "get_absolute_file_path"},
+    {sci_copyfile, "copyfile"},
+    {sci_isfile, "isfile"},
+    {sci_fileparts, "fileparts"},
+    {sci_movefile, "movefile"},
+    {sci_basename, "basename"},
+    {sci_pathconvert, "pathconvert"},
+    {sci_chdir, "cd"},
+    {sci_mgetl, "mgetl"},
+    {sci_mputl, "mputl"},
+    {sci_tempname, "tempname"},
+    {sci_getURL, "getURL"},
+    {sci_getURLcontent, "getURLcontent"},
+    {sci_splitURL, "splitURL"}
 };
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 int gw_fileio(void)
 {
-    Rhs = Max(0,Rhs);
+    Rhs = Max(0, Rhs);
 
-    if(pvApiCtx == NULL)
+    if (pvApiCtx == NULL)
     {
         pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
     }
 
-    pvApiCtx->pstName = (char*)Tab[Fin-1].name;
+    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
     callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
     return 0;
 }
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_getURL.c b/scilab/modules/fileio/sci_gateway/c/sci_getURL.c
new file mode 100644 (file)
index 0000000..9508f1f
--- /dev/null
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2011 - DIGITEO - Sylvestre LEDRU
+ * Copyright (C) 2013 - Scilab Enterprises - Antoine ELIAS
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include <stdio.h>
+#include "sciprint.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "MALLOC.h"
+#include "dlManager.h"
+#include "localization.h"
+/* ==================================================================== */
+static void freeAllocatedStrings(char *url, char *dest, char *username, char *password)
+{
+    if (url != NULL)
+    {
+        freeAllocatedSingleString(url);
+    }
+
+    if (dest != NULL)
+    {
+        freeAllocatedSingleString(dest);
+    }
+
+    if (username != NULL)
+    {
+        freeAllocatedSingleString(username);
+    }
+
+    if (password != NULL)
+    {
+        freeAllocatedSingleString(password);
+    }
+}
+
+/* ==================================================================== */
+int sci_getURL(char *fname, int fname_len)
+{
+    SciErr sciErr;
+    int length = 0;
+
+    int *piAddr = NULL;
+    char *url = NULL;
+    char *dest = NULL;
+    char *username = NULL;
+    char *password = NULL;
+
+    int iRows = 0, iCols = 0;
+    int iType = 0;
+    int *piAddressVarOne = NULL;
+    int ret = 0;
+    char *filePath = NULL;
+
+    int iRhs = nbInputArgument(pvApiCtx);
+
+    CheckInputArgument(pvApiCtx, 1, 4);
+    CheckOutputArgument(pvApiCtx, 0, 1);
+
+
+    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    ret = getAllocatedSingleString(pvApiCtx, piAddressVarOne, &url);
+    if (ret)
+    {
+        Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 1);
+        freeAllocatedStrings(url, dest, username, password);
+        return 0;
+    }
+
+    if (iRhs > 1)
+    {
+        /* Specify the destination */
+        int *piAddressVarTwo = NULL;
+
+        sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+        ret = getAllocatedSingleString(pvApiCtx, piAddressVarTwo, &dest);
+        if (ret)
+        {
+            Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 2);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+    }
+    if (iRhs > 2)
+    {
+        /* Specify the username */
+        int *piAddressVarThree = NULL;
+
+        sciErr = getVarAddressFromPosition(pvApiCtx, 3, &piAddressVarThree);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+        ret = getAllocatedSingleString(pvApiCtx, piAddressVarThree, &username);
+        if (ret)
+        {
+            Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 3);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+    }
+
+    if (iRhs > 3)
+    {
+        /* Specify the password */
+        int *piAddressVarFour = NULL;
+
+        sciErr = getVarAddressFromPosition(pvApiCtx, 4, &piAddressVarFour);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+        ret = getAllocatedSingleString(pvApiCtx, piAddressVarFour, &password);
+        if (ret)
+        {
+            Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 4);
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+
+    }
+
+    /* Set to NULL if 0 length strings */
+    if (url != NULL && strlen(url) == 0)
+    {
+        url = NULL;
+    }
+
+    if (dest != NULL && strlen(dest) == 0)
+    {
+        dest = NULL;
+    }
+
+    if (username != NULL && strlen(username) == 0)
+    {
+        username = NULL;
+    }
+
+    if (password != NULL && strlen(password) == 0)
+    {
+        password = NULL;
+    }
+
+    // call function
+    filePath = downloadFile(url, dest, username, password);
+    if (filePath != NULL)
+    {
+        //create new variable
+        ret = createSingleString(pvApiCtx, iRhs + 1, filePath);
+        FREE(filePath);
+        filePath = NULL;
+        if (ret)
+        {
+            Scierror(999, _("%s: Could not create the output argument.\n"));
+            freeAllocatedStrings(url, dest, username, password);
+            return 0;
+        }
+    }
+
+    AssignOutputVariable(pvApiCtx, 1) = iRhs + 1;
+    ReturnArguments(pvApiCtx);
+    return 0;
+}
+
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_getURLcontent.c b/scilab/modules/fileio/sci_gateway/c/sci_getURLcontent.c
new file mode 100644 (file)
index 0000000..f4c95a4
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2011 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include <stdio.h>
+#include "sciprint.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "MALLOC.h"
+#include "dlManager.h"
+#include "localization.h"
+/* ==================================================================== */
+static void freeAllocatedStrings(char *url, char *username, char *password)
+{
+    if (url != NULL)
+    {
+        freeAllocatedSingleString(url);
+    }
+
+    if (username != NULL)
+    {
+        freeAllocatedSingleString(username);
+    }
+
+    if (password != NULL)
+    {
+        freeAllocatedSingleString(password);
+    }
+}
+/* ==================================================================== */
+int sci_getURLcontent(char *fname, int fname_len)
+{
+    SciErr sciErr;
+    int length = 0;
+
+    int *piAddr = NULL;
+    char *url = NULL;
+    char *username = NULL;
+    char *password = NULL;
+
+    int iRows = 0, iCols = 0;
+    int iType = 0;
+    int *piAddressVarOne = NULL;
+    int ret = 0;
+    char *content = NULL;
+
+    int iRhs = nbInputArgument(pvApiCtx);
+
+    CheckInputArgument(pvApiCtx, 1, 3);
+    CheckOutputArgument(pvApiCtx, 0, 1);
+
+    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    ret = getAllocatedSingleString(pvApiCtx, piAddressVarOne, &url);
+    if (ret)
+    {
+        Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 1);
+        freeAllocatedStrings(url, username, password);
+        return 0;
+    }
+
+    if (iRhs > 1)
+    {
+        /* Specify the username */
+        int *piAddressVarTwo = NULL;
+
+        sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            freeAllocatedStrings(url, username, password);
+            return 0;
+        }
+
+        ret = getAllocatedSingleString(pvApiCtx, piAddressVarTwo, &username);
+        if (ret)
+        {
+            Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 2);
+            freeAllocatedStrings(url, username, password);
+            return 0;
+        }
+    }
+
+    if (iRhs > 2)
+    {
+        /* Specify the password */
+        int *piAddressVarThree = NULL;
+
+        sciErr = getVarAddressFromPosition(pvApiCtx, 3, &piAddressVarThree);
+        if (sciErr.iErr)
+        {
+            printError(&sciErr, 0);
+            freeAllocatedStrings(url, username, password);
+            return 0;
+        }
+
+        ret = getAllocatedSingleString(pvApiCtx, piAddressVarThree, &password);
+        if (ret)
+        {
+            Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 3);
+            freeAllocatedStrings(url, username, password);
+            return 0;
+        }
+
+    }
+
+    /* Set to NULL if 0 length strings */
+    if (url != NULL && strlen(url) == 0)
+    {
+        url = NULL;
+    }
+
+    if (username != NULL && strlen(username) == 0)
+    {
+        username = NULL;
+    }
+
+    if (password != NULL && strlen(password) == 0)
+    {
+        password = NULL;
+    }
+
+
+    // call function
+    content = downloadContent(url, username, password);
+    if (content != NULL)
+    {
+        //create new variable
+        int res = createSingleString(pvApiCtx, iRhs + 1, content);
+        FREE(content);
+        content = NULL;
+        if (res)
+        {
+            Scierror(999, _("%s: Could not create the output argument.\n"));
+            freeAllocatedStrings(url, username, password);
+            return 0;
+        }
+    }
+
+    AssignOutputVariable(pvApiCtx, 1) = iRhs + 1;
+    ReturnArguments(pvApiCtx);
+    return 0;
+}
+/* ==================================================================== */
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_splitURL.c b/scilab/modules/fileio/sci_gateway/c/sci_splitURL.c
new file mode 100644 (file)
index 0000000..095ec88
--- /dev/null
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2011 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include <stdio.h>
+#include <libxml/uri.h>
+#include "sciprint.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "MALLOC.h"
+#include "localization.h"
+
+/* ==================================================================== */
+int sci_splitURL(char *fname, int fname_len)
+{
+    SciErr sciErr;
+    int length = 0;
+    int *piAddr = NULL;
+    char *url = NULL;
+    char *dest = NULL;
+
+    int iRows = 0, iCols = 0;
+    int iType = 0;
+    int *piAddressVarOne = NULL;
+    char *emptyString = "";
+    int ret = 0;
+    xmlURIPtr c = NULL;
+    int zero = 0;
+
+    int iRhs = nbInputArgument(pvApiCtx);
+
+    CheckInputArgument(pvApiCtx, 1, 1);
+    CheckOutputArgument(pvApiCtx, 0, 7);
+
+    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    ret = getAllocatedSingleString(pvApiCtx, piAddressVarOne, &url);
+    if (ret)
+    {
+        Scierror(999, _("%s: Wrong type for argument %d: A string expected.\n"), fname, 1);
+        return 0;
+    }
+
+    c = xmlParseURI(url);
+    if (c == NULL)
+    {
+        Scierror(999, "Could not parse the URL.\n");
+        return 0;
+    }
+
+    // protocol (http, ftp...)
+    sciErr = createMatrixOfString(pvApiCtx, iRhs + 1, 1, 1, &c->scheme);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 1) = iRhs + 1;
+
+    // server
+    sciErr = createMatrixOfString(pvApiCtx, iRhs + 2, 1, 1, &c->server);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 2) = iRhs + 2;
+
+    // path
+    if (c->path != NULL)
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 3, 1, 1, &c->path);
+    }
+    else
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 3, 1, 1, &emptyString);
+    }
+
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 3) = iRhs + 3;
+
+    // query
+    if (c->query != NULL)
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 4, 1, 1, &c->query);
+    }
+    else
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 4, 1, 1, &emptyString);
+    }
+
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 4) = iRhs + 4;
+
+    // user
+    if (c->user != NULL)
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 5, 1, 1, &c->user);
+    }
+    else
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 5, 1, 1, &emptyString);
+    }
+
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 5) = iRhs + 5;
+
+    // port
+    if (c->port != NULL)
+    {
+        sciErr = createMatrixOfInteger32(pvApiCtx, iRhs + 6, 1, 1, &c->port);
+    }
+    else
+    {
+        sciErr = createMatrixOfInteger32(pvApiCtx, iRhs + 6, 1, 1, &zero);
+    }
+
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 6) = iRhs + 6;
+
+    // Fragment
+    if (c->fragment != NULL)
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 7, 1, 1, &c->fragment);
+    }
+    else
+    {
+        sciErr = createMatrixOfString(pvApiCtx, iRhs + 7, 1, 1, &emptyString);
+    }
+
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    AssignOutputVariable(pvApiCtx, 7) = iRhs + 7;
+    ReturnArguments(pvApiCtx);
+    return 0;
+}
+
+/*
+probably useless or internal to libxml
+// opaque
+if (c->opaque != NULL)
+{
+sciErr = createMatrixOfString(pvApiCtx, iRhs + 5, 1, 1, &c->opaque);
+}
+else
+{
+sciErr = createMatrixOfString(pvApiCtx, iRhs + 5, 1, 1, &emptyString);
+}
+if (sciErr.iErr)
+{
+printError(&sciErr, 0);
+return 0;
+}
+AssignOutputVariable(pvApiCtx, 5) = iRhs + 5;
+
+// authority
+if (c->authority != NULL)
+{
+sciErr = createMatrixOfString(pvApiCtx, iRhs + 6, 1, 1, &c->authority);
+}
+else
+{
+sciErr = createMatrixOfString(pvApiCtx, iRhs + 6, 1, 1, &emptyString);
+}
+if (sciErr.iErr)
+{
+printError(&sciErr, 0);
+return 0;
+}
+AssignOutputVariable(pvApiCtx, 6) = iRhs + 6;
+
+// Clean up
+sciErr = createMatrixOfInteger32(pvApiCtx, iRhs + 10, 1, 1, &c->cleanup);
+if (sciErr.iErr)
+{
+printError(&sciErr, 0);
+return 0;
+}
+AssignOutputVariable(pvApiCtx, 10) = iRhs + 10;
+
+*/
index 39d5656..7c91378 100644 (file)
@@ -14,8 +14,8 @@
  -->
 <!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
 <GATEWAY name="fileio">
-<!-- =================== -->
-<!--
+    <!-- =================== -->
+    <!--
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
  ===================
  Don't touch if you do not know what you are doing
 -->
-<!-- =================== -->
-
-<PRIMITIVE gatewayId="34" primitiveId="1" primitiveName="mopen" />
-<PRIMITIVE gatewayId="34" primitiveId="2" primitiveName="mputstr" />
-<PRIMITIVE gatewayId="34" primitiveId="3" primitiveName="mclose" />
-<PRIMITIVE gatewayId="34" primitiveId="4" primitiveName="mput" />
-<PRIMITIVE gatewayId="34" primitiveId="5" primitiveName="mget" />
-<PRIMITIVE gatewayId="34" primitiveId="6" primitiveName="mgetstr" />
-<PRIMITIVE gatewayId="34" primitiveId="7" primitiveName="meof" />
-<PRIMITIVE gatewayId="34" primitiveId="8" primitiveName="mseek" />
-<PRIMITIVE gatewayId="34" primitiveId="9" primitiveName="mtell" />
-<PRIMITIVE gatewayId="34" primitiveId="10" primitiveName="mclearerr" />
-<PRIMITIVE gatewayId="34" primitiveId="11" primitiveName="mfprintf" />
-<PRIMITIVE gatewayId="34" primitiveId="12" primitiveName="mscanf" />
-<PRIMITIVE gatewayId="34" primitiveId="13" primitiveName="mfscanf" />
-<PRIMITIVE gatewayId="34" primitiveId="14" primitiveName="msscanf" />
-<PRIMITIVE gatewayId="34" primitiveId="15" primitiveName="fscanfMat" />
-<PRIMITIVE gatewayId="34" primitiveId="16" primitiveName="fprintfMat" />
-<PRIMITIVE gatewayId="34" primitiveId="17" primitiveName="merror" />
-<PRIMITIVE gatewayId="34" primitiveId="18" primitiveName="findfiles" />
-<PRIMITIVE gatewayId="34" primitiveId="19" primitiveName="maxfiles" />
-<PRIMITIVE gatewayId="34" primitiveId="20" primitiveName="getdrives" />
-<PRIMITIVE gatewayId="34" primitiveId="21" primitiveName="fullpath" />
-<PRIMITIVE gatewayId="34" primitiveId="22" primitiveName="deletefile" />
-<PRIMITIVE gatewayId="34" primitiveId="23" primitiveName="pathsep"/>
-<PRIMITIVE gatewayId="34" primitiveId="24" primitiveName="filesep"/>
-<PRIMITIVE gatewayId="34" primitiveId="25" primitiveName="getlongpathname"/>
-<PRIMITIVE gatewayId="34" primitiveId="26" primitiveName="getshortpathname"/>
-<PRIMITIVE gatewayId="34" primitiveId="27" primitiveName="fileext"/>
-<PRIMITIVE gatewayId="34" primitiveId="28" primitiveName="isdir"/>
-<PRIMITIVE gatewayId="34" primitiveId="29" primitiveName="removedir"/>
-<PRIMITIVE gatewayId="34" primitiveId="30" primitiveName="createdir"/>
-<PRIMITIVE gatewayId="34" primitiveId="31" primitiveName="pwd" />
-<PRIMITIVE gatewayId="34" primitiveId="32" primitiveName="chdir" />
-<PRIMITIVE gatewayId="34" primitiveId="33" primitiveName="fileinfo" />
-<PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" />
-<PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="getrelativefilename" />
-<PRIMITIVE gatewayId="34" primitiveId="36" primitiveName="get_absolute_file_path" />
-<PRIMITIVE gatewayId="34" primitiveId="37" primitiveName="copyfile" />
-<PRIMITIVE gatewayId="34" primitiveId="38" primitiveName="isfile" />
-<PRIMITIVE gatewayId="34" primitiveId="39" primitiveName="fileparts" />
-<PRIMITIVE gatewayId="34" primitiveId="40" primitiveName="movefile" />
-<PRIMITIVE gatewayId="34" primitiveId="41" primitiveName="basename" />
-<PRIMITIVE gatewayId="34" primitiveId="42" primitiveName="pathconvert" />
-<PRIMITIVE gatewayId="34" primitiveId="43" primitiveName="cd" />
-<PRIMITIVE gatewayId="34" primitiveId="44" primitiveName="mgetl" />
-<PRIMITIVE gatewayId="34" primitiveId="45" primitiveName="mputl" />
-<PRIMITIVE gatewayId="34" primitiveId="46" primitiveName="tempname" />
+    <!-- =================== -->
+    
+    <PRIMITIVE gatewayId="34" primitiveId="1" primitiveName="mopen" />
+    <PRIMITIVE gatewayId="34" primitiveId="2" primitiveName="mputstr" />
+    <PRIMITIVE gatewayId="34" primitiveId="3" primitiveName="mclose" />
+    <PRIMITIVE gatewayId="34" primitiveId="4" primitiveName="mput" />
+    <PRIMITIVE gatewayId="34" primitiveId="5" primitiveName="mget" />
+    <PRIMITIVE gatewayId="34" primitiveId="6" primitiveName="mgetstr" />
+    <PRIMITIVE gatewayId="34" primitiveId="7" primitiveName="meof" />
+    <PRIMITIVE gatewayId="34" primitiveId="8" primitiveName="mseek" />
+    <PRIMITIVE gatewayId="34" primitiveId="9" primitiveName="mtell" />
+    <PRIMITIVE gatewayId="34" primitiveId="10" primitiveName="mclearerr" />
+    <PRIMITIVE gatewayId="34" primitiveId="11" primitiveName="mfprintf" />
+    <PRIMITIVE gatewayId="34" primitiveId="12" primitiveName="mscanf" />
+    <PRIMITIVE gatewayId="34" primitiveId="13" primitiveName="mfscanf" />
+    <PRIMITIVE gatewayId="34" primitiveId="14" primitiveName="msscanf" />
+    <PRIMITIVE gatewayId="34" primitiveId="15" primitiveName="fscanfMat" />
+    <PRIMITIVE gatewayId="34" primitiveId="16" primitiveName="fprintfMat" />
+    <PRIMITIVE gatewayId="34" primitiveId="17" primitiveName="merror" />
+    <PRIMITIVE gatewayId="34" primitiveId="18" primitiveName="findfiles" />
+    <PRIMITIVE gatewayId="34" primitiveId="19" primitiveName="maxfiles" />
+    <PRIMITIVE gatewayId="34" primitiveId="20" primitiveName="getdrives" />
+    <PRIMITIVE gatewayId="34" primitiveId="21" primitiveName="fullpath" />
+    <PRIMITIVE gatewayId="34" primitiveId="22" primitiveName="deletefile" />
+    <PRIMITIVE gatewayId="34" primitiveId="23" primitiveName="pathsep"/>
+    <PRIMITIVE gatewayId="34" primitiveId="24" primitiveName="filesep"/>
+    <PRIMITIVE gatewayId="34" primitiveId="25" primitiveName="getlongpathname"/>
+    <PRIMITIVE gatewayId="34" primitiveId="26" primitiveName="getshortpathname"/>
+    <PRIMITIVE gatewayId="34" primitiveId="27" primitiveName="fileext"/>
+    <PRIMITIVE gatewayId="34" primitiveId="28" primitiveName="isdir"/>
+    <PRIMITIVE gatewayId="34" primitiveId="29" primitiveName="removedir"/>
+    <PRIMITIVE gatewayId="34" primitiveId="30" primitiveName="createdir"/>
+    <PRIMITIVE gatewayId="34" primitiveId="31" primitiveName="pwd" />
+    <PRIMITIVE gatewayId="34" primitiveId="32" primitiveName="chdir" />
+    <PRIMITIVE gatewayId="34" primitiveId="33" primitiveName="fileinfo" />
+    <PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" />
+    <PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="getrelativefilename" />
+    <PRIMITIVE gatewayId="34" primitiveId="36" primitiveName="get_absolute_file_path" />
+    <PRIMITIVE gatewayId="34" primitiveId="37" primitiveName="copyfile" />
+    <PRIMITIVE gatewayId="34" primitiveId="38" primitiveName="isfile" />
+    <PRIMITIVE gatewayId="34" primitiveId="39" primitiveName="fileparts" />
+    <PRIMITIVE gatewayId="34" primitiveId="40" primitiveName="movefile" />
+    <PRIMITIVE gatewayId="34" primitiveId="41" primitiveName="basename" />
+    <PRIMITIVE gatewayId="34" primitiveId="42" primitiveName="pathconvert" />
+    <PRIMITIVE gatewayId="34" primitiveId="43" primitiveName="cd" />
+    <PRIMITIVE gatewayId="34" primitiveId="44" primitiveName="mgetl" />
+    <PRIMITIVE gatewayId="34" primitiveId="45" primitiveName="mputl" />
+    <PRIMITIVE gatewayId="34" primitiveId="46" primitiveName="tempname" />
+    <PRIMITIVE gatewayId="34" primitiveId="47" primitiveName="getURL" />
+    <PRIMITIVE gatewayId="34" primitiveId="48" primitiveName="getURLcontent" />
+    <PRIMITIVE gatewayId="34" primitiveId="49" primitiveName="splitURL" />
 </GATEWAY>
index ce4a942..85a19ba 100644 (file)
@@ -2,33 +2,36 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - Allan CORNET
  * ...
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-/*--------------------------------------------------------------------------*/ 
-#include <windows.h> 
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
+#include <windows.h>
+/*--------------------------------------------------------------------------*/
 #pragma comment(lib,"../../bin/libintl.lib")
-/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../bin/libxml2.lib")
+#pragma comment(lib,"../../bin/libcurl.lib")
+
+/*--------------------------------------------------------------------------*/
 int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
 {
-  switch (reason) 
+    switch (reason)
     {
-    case DLL_PROCESS_ATTACH:
-      break;
-    case DLL_PROCESS_DETACH:
-      break;
-    case DLL_THREAD_ATTACH:
-      break;
-    case DLL_THREAD_DETACH:
-      break;
+        case DLL_PROCESS_ATTACH:
+            break;
+        case DLL_PROCESS_DETACH:
+            break;
+        case DLL_THREAD_ATTACH:
+            break;
+        case DLL_THREAD_DETACH:
+            break;
     }
-  return 1;
+    return 1;
 }
-/*--------------------------------------------------------------------------*/ 
+/*--------------------------------------------------------------------------*/
 
diff --git a/scilab/modules/fileio/src/c/dlManager.c b/scilab/modules/fileio/src/c/dlManager.c
new file mode 100644 (file)
index 0000000..fa222e7
--- /dev/null
@@ -0,0 +1,606 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2012 - S/E - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef _MSC_VER
+#define _GNU_SOURCE             /* basename crashes this extension otherwise */
+#endif
+#include <curl/curl.h>
+#include <libxml/uri.h>
+#include <string.h>
+#include "dlManager.h"
+#include "Scierror.h"
+#include "SCIHOME.h"
+#include "getos.h"
+#include "PATH_MAX.h"
+#include "MALLOC.h"
+#include "isdir.h"
+#include "charEncoding.h"
+#include "localization.h"
+#include "getos.h"
+/* ==================================================================== */
+#ifndef HAVE_BASENAME
+static char *Curl_basename(char *path);
+#define basename(x)  Curl_basename((x))
+#endif
+/* ==================================================================== */
+static char errorBuffer[CURL_ERROR_SIZE];
+/* ==================================================================== */
+static int getProxyValues(char **proxyHost, long *proxyPort, char **proxyUserPwd);
+/* ==================================================================== */
+struct inputString
+{
+    char *ptr;
+    size_t len;
+};
+/* ==================================================================== */
+static void init_string(struct inputString *s)
+{
+    s->len = 0;
+    s->ptr = (char*)CALLOC(s->len + 1, sizeof(char));
+    if (s->ptr == NULL)
+    {
+        Scierror(999, "Internal error: calloc() failed.\n");
+        return;
+    }
+    s->ptr[0] = '\0';
+}
+/* ==================================================================== */
+static size_t writefunc(void *ptr, size_t size, size_t nmemb, struct inputString *s)
+{
+    size_t new_len = s->len + size * nmemb;
+
+    s->ptr = (char*)REALLOC(s->ptr, new_len + 1);
+    if (s->ptr == NULL)
+    {
+        Scierror(999, "Internal error: realloc() failed.\n");
+        return NULL;
+    }
+    memcpy(s->ptr + s->len, ptr, size * nmemb);
+    s->ptr[new_len] = '\0';
+    s->len = new_len;
+
+    return size * nmemb;
+}
+/* ==================================================================== */
+static char *getFileNameFromURL(char *url)
+{
+    char *filename = NULL;
+    xmlURIPtr c = xmlParseURI(url);
+
+    if (c == NULL)
+    {
+        Scierror(999, _("Could not parse the URL.\n"));
+        return NULL;
+    }
+
+    if (c->path == NULL || strcmp(c->path, "/") == 0)
+    {
+        filename = (char *)MALLOC((strlen(DEFAULT_FILENAME) + 1) * sizeof(char));
+        strcpy(filename, DEFAULT_FILENAME);
+    }
+    else
+    {
+        char bname[PATH_MAX];
+
+        if (c->path == NULL)
+        {
+            Scierror(43, "Internal error: c->path is null ?!\n");
+        }
+        strcpy(bname, basename(c->path));
+        filename = (char *)MALLOC((strlen(bname) + 1) * sizeof(char));
+        strcpy(filename, bname);
+    }
+    return filename;
+
+}
+/* ==================================================================== */
+int getProxyValues(char **proxyHost, long *proxyPort, char **proxyUserPwd)
+{
+    FILE * pFile;
+    long lSize;
+    char * buffer;
+    size_t result;
+
+    char *configPtr;
+    char *osName;
+
+    char *host, *user, *password, *userpwd;
+    long port;
+    int useproxy;
+
+    char *tp, *field, *value, *eqptr;
+    int eqpos, tplen;
+
+    //construct ATOMS config file path
+    configPtr = (char *)MALLOC(PATH_MAX * sizeof(char));
+    strcpy(configPtr, getSCIHOME());
+
+    osName = (char *)MALLOC(50 * sizeof(char));
+    strcpy(osName, getOSFullName());
+    if (strcmp(osName, "Windows") == 0)
+    {
+        char *osVer = (char *)MALLOC(50 * sizeof(char));
+        strcpy(osVer, getOSRelease());
+        if (strstr(osVer, "x64") != NULL)
+        {
+            strcat(configPtr, "/.atoms/x64/config");
+        }
+        else
+        {
+            strcat(configPtr, "/.atoms/config");
+        }
+    }
+    else
+    {
+        strcat(configPtr, "/.atoms/config");
+    }
+
+
+    wcfopen (pFile, configPtr , "rb" );
+    if (pFile == NULL)
+    {
+        //             Scierror(999,"Could not open scicurl_config file\n");
+        return 0;
+    }
+
+    fseek (pFile , 0 , SEEK_END);
+    lSize = ftell(pFile);
+    rewind (pFile);
+
+    // allocate memory to contain the whole file
+    buffer = (char*)MALLOC((lSize + 1) * sizeof(char));
+    if (buffer == NULL)
+    {
+        return 0;
+    }
+    buffer[lSize] = '\0';
+
+    // copy the file into the buffer
+    result = fread (buffer, 1, lSize, pFile);
+    if (result != lSize)
+    {
+        Scierror(999, _("Failed to read the scicurl_config file '%s'.\n"), configPtr);
+        return 0;
+    }
+
+    host = user = password = userpwd = NULL;
+    useproxy = 0;
+
+    tp = field = value = eqptr = NULL;
+    eqpos = tplen = 0;
+
+
+    // parse each line to extract variables
+    tp = strtok(buffer, "\n");
+    while (tp != NULL)
+    {
+
+        eqptr = strrchr(tp, '=');
+        tplen = (int)strlen(tp);
+        if (eqptr == NULL)
+        {
+            Scierror(999, _("Improper syntax of scicurl_config file ('%s'), '=' not found %d:%s\n"), configPtr, tplen, tp);
+            return 0;
+        }
+        eqpos = (int)(eqptr - tp);
+        if (tplen <= eqpos + 1)
+        {
+            Scierror(999, _("Improper syntax of scicurl_config file ('%s'), after an '='\n"), configPtr);
+            return 0;
+        }
+        if (tp[eqpos - 1] != ' ' || tp[eqpos + 1] != ' ')
+        {
+            Scierror(999, _("Improper syntax of scicurl_config file ('%s'), space before and after '=' expected\n"), configPtr);
+            return 0;
+        }
+
+        //get field and value from each line
+        field = (char *)MALLOC(sizeof(char) * (eqpos));
+        value = (char *)MALLOC(sizeof(char) * (strlen(tp) - eqpos - 1));
+
+        memcpy(field, tp, eqpos - 1);
+        field[eqpos - 1] = '\0';
+
+        memcpy(value, tp + eqpos + 2, strlen(tp) - eqpos - 2);
+        value[strlen(tp) - eqpos - 2] = '\0';
+
+
+        //check and read proxy variables
+        if (strcmp(field, "useProxy") == 0)
+        {
+            if (strcmp(value, "False") == 0)
+            {
+                return 0;
+            }
+            if (strcmp(value, "True") == 0)
+            {
+                useproxy = 1;
+            }
+        }
+        else if (strcmp(field, "proxyHost") == 0)
+        {
+            host = (char *)MALLOC((strlen(value) + 1) * sizeof(char));
+            strcpy(host, value);
+        }
+        else if (strcmp(field, "proxyPort") == 0)
+        {
+            port = strtol(value, NULL, 10);
+        }
+        else if (strcmp(field, "proxyUser") == 0)
+        {
+            user = (char *)MALLOC((strlen(value) + 1) * sizeof(char));
+            strcpy(user, value);
+        }
+        else if (strcmp(field, "proxyPassword") == 0)
+        {
+            password = (char *)MALLOC((strlen(value) + 1) * sizeof(char));
+            strcpy(password, value);
+        }
+
+        free(field);
+        free(value);
+
+        tp = strtok(NULL, "\n");
+    }
+
+    // if proxy is set, update the parameters
+    if (useproxy == 1)
+    {
+
+        // proxyUserPwd = "user:password"
+        int userlen, passlen;
+        userlen = passlen = 0;
+        if (user != NULL)
+        {
+            userlen = (int)strlen(user);
+        }
+        if (password != NULL)
+        {
+            passlen = (int)strlen(user);
+        }
+        if (userlen + passlen != 0)
+        {
+            userpwd = (char *)MALLOC((userlen + passlen + 2) * sizeof(char));
+            strcpy(userpwd, user);
+            strcat(userpwd, ":");
+            if (password != NULL)
+            {
+                strcat(userpwd, password);
+            }
+        }
+
+        *proxyHost = host;
+        *proxyPort = port;
+        *proxyUserPwd = userpwd;
+
+    }
+
+    fclose(pFile);
+    free(buffer);
+    return useproxy;
+}
+/* ==================================================================== */
+char *downloadFile(char *url, char *dest, char *username, char *password)
+{
+    CURL *curl;
+    CURLcode res;
+    char *filename = NULL;
+
+    curl = curl_easy_init();
+
+    if (curl)
+    {
+        FILE *file;
+
+        if (dest == NULL)
+        {
+            /* No second argument provided */
+            filename = getFileNameFromURL(url);
+        }
+        else
+        {
+            if (isdir(dest))
+            {
+                /* The target is a directory. Select the name from the URL */
+                char *name = getFileNameFromURL(url);
+
+                filename = (char *)MALLOC((strlen(name) + strlen("/") + strlen(dest) + 1) * sizeof(char));
+                strcpy(filename, dest);
+                strcat(filename, "/");
+                strcat(filename, name);
+
+            }
+            else
+            {
+                filename = (char *)MALLOC((strlen(dest) + 1) * sizeof(char));
+                strcpy(filename, dest);
+            }
+        }
+
+        wcfopen(file, (char*)filename, "wb");
+
+        if (file == NULL)
+        {
+            Scierror(999, _("Failed opening '%s' for writing.\n"), filename);
+            return NULL;
+        }
+
+        res = curl_easy_setopt(curl, CURLOPT_URL, url);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, _("Failed to set URL [%s]\n"), errorBuffer);
+            return NULL;
+        }
+
+        //Set authentication variables
+        if (username != NULL)
+        {
+            char * userpass;
+            int uplen = (int)strlen(username);
+            if (password != NULL)
+            {
+                uplen = uplen + (int)strlen(password);
+            }
+
+            userpass = (char *)MALLOC((uplen + 2) * sizeof(char));
+
+            strcpy(userpass, username);
+            strcat(userpass, ":");
+            if (password != NULL)
+            {
+                strcat(userpass, password);
+            }
+
+            res = curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, "Failed to set httpauth type to ANY [%s]\n", errorBuffer);
+                return NULL;
+            }
+            res = curl_easy_setopt(curl, CURLOPT_USERPWD, userpass);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, _("Failed to set user:pwd [%s]\n"), errorBuffer);
+                return NULL;
+            }
+        }
+
+        {
+            //Set proxy variables
+            char *proxyHost = NULL;
+            char *proxyUserPwd = NULL;
+            long proxyPort = 1080;
+            int proxySet = 0;
+
+            proxySet = getProxyValues(&proxyHost, &proxyPort, &proxyUserPwd);
+
+            if (proxySet == 1)
+            {
+                res = curl_easy_setopt(curl, CURLOPT_PROXY, proxyHost);
+                if (res != CURLE_OK)
+                {
+                    Scierror(999, _("Failed to set proxy host [%s]\n"), errorBuffer);
+                    return NULL;
+                }
+                curl_easy_setopt(curl, CURLOPT_PROXYPORT, proxyPort);
+                if (res != CURLE_OK)
+                {
+                    Scierror(999, _("Failed to set proxy port [%s]\n"), errorBuffer);
+                    return NULL;
+                }
+                if (proxyUserPwd != NULL)
+                {
+                    res = curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxyUserPwd);
+                    if (res != CURLE_OK)
+                    {
+                        Scierror(999, _("Failed to set proxy user:password [%s]\n"), errorBuffer);
+                        return NULL;
+                    }
+                }
+
+            }
+        }
+
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, _("Failed to set write data [%s]\n"), errorBuffer);
+            return NULL;
+        }
+
+        //Get data to be written to file
+        res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, _("Failed to set write data [%s]\n"), errorBuffer);
+            return NULL;
+        }
+
+        // Follow redirects
+        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+
+        res = curl_easy_perform(curl);
+
+        if (res != 0)
+        {
+            Scierror(999, _("Transfer did not complete successfully: %s\n"), errorBuffer);
+            return NULL;
+        }
+
+        /* always cleanup */
+        curl_easy_cleanup(curl);
+
+        fclose(file);
+
+        return filename;
+    }
+    else
+    {
+        Scierror(999, "Failed opening the curl handle.\n");
+        return NULL;
+    }
+    return NULL;
+}
+/* ==================================================================== */
+char *downloadContent(char *url, char *username, char *password)
+{
+    CURL *curl = NULL;
+    CURLcode res;
+
+    char *proxyHost = NULL;
+    char *proxyUserPwd = NULL;
+    long proxyPort = 1080;
+    int proxySet = 0;
+
+    curl = curl_easy_init();
+
+    if (curl)
+    {
+
+        struct inputString buffer;
+
+        init_string(&buffer);
+        res = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, "Failed to set error buffer [%d]\n", res);
+            return NULL;
+        }
+
+        res = curl_easy_setopt(curl, CURLOPT_URL, url);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, "Failed to set URL [%s]\n", errorBuffer);
+            return NULL;
+        }
+
+        //Set authentication variables
+        if (username != NULL)
+        {
+            char * userpass;
+            int uplen = (int)strlen(username);
+            if (password != NULL)
+            {
+                uplen = uplen + (int)strlen(password);
+            }
+
+            userpass = (char *)MALLOC((uplen + 2) * sizeof(char));
+            strcpy(userpass, username);
+            strcat(userpass, ":");
+            if (password != NULL)
+            {
+                strcat(userpass, password);
+            }
+
+            res = curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, "Failed to set httpauth type to ANY [%s]\n", errorBuffer);
+                return NULL;
+            }
+            res = curl_easy_setopt(curl, CURLOPT_USERPWD, userpass);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, _("Failed to set user:pwd [%s]\n"), errorBuffer);
+                return NULL;
+            }
+        }
+
+        //Set proxy variables
+
+        proxySet = getProxyValues(&proxyHost, &proxyPort, &proxyUserPwd);
+        if (proxySet == 1)
+        {
+            res = curl_easy_setopt(curl, CURLOPT_PROXY, proxyHost);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, _("Failed to set proxy host [%s]\n"), errorBuffer);
+                return NULL;
+            }
+            curl_easy_setopt(curl, CURLOPT_PROXYPORT, proxyPort);
+            if (res != CURLE_OK)
+            {
+                Scierror(999, _("Failed to set proxy port [%s]\n"), errorBuffer);
+                return NULL;
+            }
+            if (proxyUserPwd != NULL)
+            {
+                res = curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxyUserPwd);
+                if (res != CURLE_OK)
+                {
+                    Scierror(999, _("Failed to set proxy user:password [%s]\n"), errorBuffer);
+                    return NULL;
+                }
+            }
+
+        }
+
+        res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, _("Failed to set write data [%s]\n"), errorBuffer);
+            return NULL;
+        }
+
+        res = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+        if (res != CURLE_OK)
+        {
+            Scierror(999, _("Failed to set write data [%s]\n"), errorBuffer);
+            return NULL;
+        }
+
+        // Follow redirects
+        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+
+        res = curl_easy_perform(curl);
+        if (res != 0)
+        {
+            Scierror(999, _("Transfer did not complete successfully: %s\n"), errorBuffer);
+            return NULL;
+        }
+
+        /* always cleanup */
+        curl_easy_cleanup(curl);
+
+        return buffer.ptr;
+    }
+    else
+    {
+        Scierror(999, "Failed opening the curl handle.\n");
+        return NULL;
+    }
+    return NULL;
+}
+/* ==================================================================== */
+static char *Curl_basename(char *path)
+{
+    char *s1 = NULL;
+    char *s2 = NULL;
+
+    s1 = strrchr(path, '/');
+    s2 = strrchr(path, '\\');
+
+    if (s1 && s2)
+    {
+        path = (s1 > s2 ? s1 : s2) + 1;
+    }
+    else if (s1)
+    {
+        path = s1 + 1;
+    }
+    else if (s2)
+    {
+        path = s2 + 1;
+    }
+    return path;
+}
+/* ==================================================================== */
diff --git a/scilab/modules/fileio/src/c/dlManager.h b/scilab/modules/fileio/src/c/dlManager.h
new file mode 100644 (file)
index 0000000..246833f
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2012 - SE - Sylvestre LEDRU
+*
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+#ifndef __DLMANAGER_H__
+#define __DLMANAGER_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "BOOL.h"
+
+#define DEFAULT_FILENAME "index.html"
+
+/**
+ * Download a file
+ * @param[in] fileUrl the location of the file
+ * @param[in] dest where to save the file
+ * @return the file pointer
+*/
+char *downloadFile(char *url, char *dest, char *username, char *password);
+
+/**
+ * Download the content of an URL
+ * @param[in] Url the location
+ * @return the content
+ */
+char *downloadContent(char *url, char *username, char *password);
+
+#endif /* __DLMANAGER_H__ */
diff --git a/scilab/modules/fileio/tests/nonreg_tests/ticket_495.tst b/scilab/modules/fileio/tests/nonreg_tests/ticket_495.tst
new file mode 100644 (file)
index 0000000..f6cff05
--- /dev/null
@@ -0,0 +1,21 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+
+tab_ref = [
+"азеазея",
+"เฮลโลเวิลด์",
+"حريات وحقوق",
+"תוכנית"];
+
+
+for i = 1:size(tab_ref, "*");
+  targetFile = TMPDIR + "/README_" + tab_ref(i);
+  myFile = getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README", targetFile);
+  assert_checkequal(targetFile, myFile);
+  assert_checkequal(isfile(targetFile), %t);
+end
diff --git a/scilab/modules/fileio/tests/unit_tests/getURL.dia.ref b/scilab/modules/fileio/tests/unit_tests/getURL.dia.ref
new file mode 100644 (file)
index 0000000..4797eeb
--- /dev/null
@@ -0,0 +1,57 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//getURL
+cd TMPDIR;
+myFile=getURL("http://www.scilab.org");
+assert_checkequal(myFile, "index.html")
+ ans  =
+  T  
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 1000); // The homepage of Scilab is likely to be bigger than 1k
+myFile=getURL("http://www.scilab.org/");
+assert_checkequal(myFile, "index.html")
+ ans  =
+  T  
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 1000); // The homepage of Scilab is likely to be bigger than 1k
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+assert_checkequal(myFile, "README");
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+targetFile=TMPDIR+"/README_Debian";
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README",targetFile);
+assert_checkequal(myFile, targetFile);
+inf=fileinfo(targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"Linux") <> []);
+mclose(f1);
+targetFile="README";
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README",TMPDIR);
+assert_checkequal(myFile, TMPDIR+"/"+targetFile);
+inf=fileinfo(TMPDIR+"/"+targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(TMPDIR+"/"+targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"Linux") <> []);
+mclose(f1);
+// HTTPS
+myFile=getURL("https://encrypted.google.com");
+assert_checkequal(myFile, "index.html");
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+targetFile=TMPDIR+"/testauth";
+myFile=getURL("http://httpbin.org/basic-auth/user/passwd",targetFile,"user","passwd");
+assert_checkequal(myFile, targetFile);
+inf=fileinfo(targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"authenticated") <> []);
+mclose(f1);
+// Badly formated URL
+assert_checkerror("getURL(''http://plop@ae:www.scilab.org:80'');", [], 999);
diff --git a/scilab/modules/fileio/tests/unit_tests/getURL.tst b/scilab/modules/fileio/tests/unit_tests/getURL.tst
new file mode 100644 (file)
index 0000000..59f865d
--- /dev/null
@@ -0,0 +1,67 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//getURL
+
+cd TMPDIR;
+myFile=getURL("http://www.scilab.org");
+assert_checkequal(myFile, "index.html")
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 1000); // The homepage of Scilab is likely to be bigger than 1k
+
+myFile=getURL("http://www.scilab.org/");
+assert_checkequal(myFile, "index.html")
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 1000); // The homepage of Scilab is likely to be bigger than 1k
+
+
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+
+assert_checkequal(myFile, "README");
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+
+
+targetFile=TMPDIR+"/README_Debian";
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README",targetFile);
+
+assert_checkequal(myFile, targetFile);
+inf=fileinfo(targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"Linux") <> []);
+mclose(f1);
+
+
+targetFile="README";
+myFile=getURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README",TMPDIR);
+
+assert_checkequal(myFile, TMPDIR+"/"+targetFile);
+inf=fileinfo(TMPDIR+"/"+targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(TMPDIR+"/"+targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"Linux") <> []);
+mclose(f1);
+
+// HTTPS
+myFile=getURL("https://encrypted.google.com");
+assert_checkequal(myFile, "index.html");
+inf=fileinfo(myFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+
+targetFile=TMPDIR+"/testauth";
+myFile=getURL("http://httpbin.org/basic-auth/user/passwd",targetFile,"user","passwd");
+
+assert_checkequal(myFile, targetFile);
+inf=fileinfo(targetFile);
+assert_checktrue(inf(1) > 10); // The file size should be more than 10
+f1 = mopen(targetFile,"r");
+assert_checktrue(grep(mgetl(f1),"authenticated") <> []);
+mclose(f1);
+
+// Badly formated URL
+assert_checkerror("getURL(''http://plop@ae:www.scilab.org:80'');", [], 999);
diff --git a/scilab/modules/fileio/tests/unit_tests/getURLcontent.dia.ref b/scilab/modules/fileio/tests/unit_tests/getURLcontent.dia.ref
new file mode 100644 (file)
index 0000000..60ebc0b
--- /dev/null
@@ -0,0 +1,33 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//getURLcontent
+HTMLContent=getURLcontent("http://www.scilab.org:80");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+HTMLContent=getURLcontent("http://plop:ae@www.scilab.org:80");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+HTMLContent=getURLcontent("http://www.scilab.org/aze");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checkequal(grep(HTMLContent,"404"), []);
+HTMLContent=getURLcontent("http://www.scilab.org");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+HTMLContent=getURLcontent("http://www.scilab.org/");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+HTMLContent=getURLcontent("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+assert_checktrue(length(HTMLContent) > 0);
+assert_checktrue(grep(HTMLContent,"Linux") <> []);
+// HTTPS
+HTMLContent=getURLcontent("https://encrypted.google.com");
+assert_checktrue(length(HTMLContent) > 100);
+HTMLContent=getURLcontent("http://httpbin.org/basic-auth/user/passwd","user","passwd");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"authenticated") <> []);
+// Badly formated URL
+assert_checkerror("getURLcontent(''http://plop@ae:www.scilab.org:80'');", [], 999);
diff --git a/scilab/modules/fileio/tests/unit_tests/getURLcontent.tst b/scilab/modules/fileio/tests/unit_tests/getURLcontent.tst
new file mode 100644 (file)
index 0000000..9caa503
--- /dev/null
@@ -0,0 +1,45 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//getURLcontent
+
+HTMLContent=getURLcontent("http://www.scilab.org:80");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+
+HTMLContent=getURLcontent("http://plop:ae@www.scilab.org:80");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+
+HTMLContent=getURLcontent("http://www.scilab.org/aze");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checkequal(grep(HTMLContent,"404"), []);
+
+
+
+HTMLContent=getURLcontent("http://www.scilab.org");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+
+HTMLContent=getURLcontent("http://www.scilab.org/");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"html") <> []);
+
+HTMLContent=getURLcontent("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+assert_checktrue(length(HTMLContent) > 0);
+assert_checktrue(grep(HTMLContent,"Linux") <> []);
+
+// HTTPS
+HTMLContent=getURLcontent("https://encrypted.google.com");
+assert_checktrue(length(HTMLContent) > 100);
+
+HTMLContent=getURLcontent("http://httpbin.org/basic-auth/user/passwd","user","passwd");
+assert_checktrue(length(HTMLContent) > 10);
+assert_checktrue(grep(HTMLContent,"authenticated") <> []);
+
+// Badly formated URL
+assert_checkerror("getURLcontent(''http://plop@ae:www.scilab.org:80'');", [], 999);
diff --git a/scilab/modules/fileio/tests/unit_tests/splitURL.dia.ref b/scilab/modules/fileio/tests/unit_tests/splitURL.dia.ref
new file mode 100644 (file)
index 0000000..045b136
--- /dev/null
@@ -0,0 +1,47 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//splitURL
+[a,b,c,d]=splitURL("http://www.scilab.org");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "");
+assert_checkequal(d, "");
+[a,b,c,d]=splitURL("http://www.scilab.org/");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/");
+assert_checkequal(d, "");
+[a,b,c,d]=splitURL("http://www.scilab.org/products/scilab/environment");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/products/scilab/environment");
+assert_checkequal(d, "");
+[a,b,c,d]=splitURL("http://www.scilab.org/content/search?SearchText=plot");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/content/search");
+assert_checkequal(d, "SearchText=plot");
+[a,b,c,d]=splitURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+assert_checkequal(a, "ftp");
+assert_checkequal(b, "ftp.free.fr");
+assert_checkequal(c, "/pub/Distributions_Linux/debian/README");
+assert_checkequal(d, "");
+[a,b,c,d]=splitURL("https://encrypted.google.com");
+assert_checkequal(a, "https");
+assert_checkequal(b, "encrypted.google.com");
+assert_checkequal(c, "");
+assert_checkequal(d, "");
+[a,b,c,d,e,f,g]=splitURL("https://plop:ae@encrypted.google.com:443/full/path?query=true#myFragment");
+assert_checkequal(a, "https");
+assert_checkequal(b, "encrypted.google.com");
+assert_checkequal(c, "/full/path");
+assert_checkequal(d, "query=true");
+assert_checkequal(e, "plop:ae");
+assert_checkequal(f, int32(443)); // port
+assert_checkequal(g, "myFragment"); // fragment
+// Badly formated URL
+assert_checkerror("splitURL(''http://plop@ae:sylvestre.ledru.info:80'');", [], 999);
diff --git a/scilab/modules/fileio/tests/unit_tests/splitURL.tst b/scilab/modules/fileio/tests/unit_tests/splitURL.tst
new file mode 100644 (file)
index 0000000..cecd20f
--- /dev/null
@@ -0,0 +1,56 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - Sylvestre LEDRU
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//splitURL
+
+[a,b,c,d]=splitURL("http://www.scilab.org");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "");
+assert_checkequal(d, "");
+
+[a,b,c,d]=splitURL("http://www.scilab.org/");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/");
+assert_checkequal(d, "");
+
+[a,b,c,d]=splitURL("http://www.scilab.org/products/scilab/environment");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/products/scilab/environment");
+assert_checkequal(d, "");
+
+[a,b,c,d]=splitURL("http://www.scilab.org/content/search?SearchText=plot");
+assert_checkequal(a, "http");
+assert_checkequal(b, "www.scilab.org");
+assert_checkequal(c, "/content/search");
+assert_checkequal(d, "SearchText=plot");
+
+[a,b,c,d]=splitURL("ftp://ftp.free.fr/pub/Distributions_Linux/debian/README");
+assert_checkequal(a, "ftp");
+assert_checkequal(b, "ftp.free.fr");
+assert_checkequal(c, "/pub/Distributions_Linux/debian/README");
+assert_checkequal(d, "");
+
+[a,b,c,d]=splitURL("https://encrypted.google.com");
+assert_checkequal(a, "https");
+assert_checkequal(b, "encrypted.google.com");
+assert_checkequal(c, "");
+assert_checkequal(d, "");
+
+[a,b,c,d,e,f,g]=splitURL("https://plop:ae@encrypted.google.com:443/full/path?query=true#myFragment");
+assert_checkequal(a, "https");
+assert_checkequal(b, "encrypted.google.com");
+assert_checkequal(c, "/full/path");
+assert_checkequal(d, "query=true");
+assert_checkequal(e, "plop:ae");
+assert_checkequal(f, int32(443)); // port
+assert_checkequal(g, "myFragment"); // fragment
+
+// Badly formated URL
+assert_checkerror("splitURL(''http://plop@ae:sylvestre.ledru.info:80'');", [], 999);
index cb5579d..38b577e 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -214,6 +215,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 90e170d..a3bca93 100644 (file)
@@ -82,10 +82,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/genetic_algorithms
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -169,6 +170,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 5dc7381..3050d67 100644 (file)
@@ -84,10 +84,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/graph
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -170,6 +171,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 4b4cd79..0094301 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/graphic_export
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -240,6 +241,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3fc5161..f302a85 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/graphic_objects
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -261,6 +262,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 911d03a..6d41290 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/graphics
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -565,6 +566,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 053c9d3..d1e33b5 100644 (file)
@@ -92,10 +92,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/gui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -326,6 +327,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index c033904..f3f21c5 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/hdf5
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -219,6 +220,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 2bb09e1..9e6c344 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/helptools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -234,6 +235,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 28ac2ab..6169ed3 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/history_browser
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -233,6 +234,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 7ba5773..1ce312f 100644 (file)
@@ -84,10 +84,11 @@ DIST_COMMON = $(libscihistory_manager_la_include_HEADERS) \
 subdir = modules/history_manager
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -238,6 +239,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 97a5ae9..2cfac26 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/integer
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -261,6 +262,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 23aba2f..fa71a81 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/interpolation
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -221,6 +222,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 8423a80..8db39fb 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
 subdir = modules/intersci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -202,6 +203,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 5270817..9b9f6e4 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/io
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -216,6 +217,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 30ad4c4..daa706c 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/javasci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -202,6 +203,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 04fd23c..f8f5e9c 100644 (file)
@@ -91,10 +91,11 @@ DIST_COMMON = $(libscijvm_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = modules/jvm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -237,6 +238,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3a90c97..e63ff5f 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/linear_algebra
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -248,6 +249,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index b0cf7c7..3fe76cb 100644 (file)
@@ -94,10 +94,11 @@ DIST_COMMON = $(libscilocalization_la_include_HEADERS) \
 subdir = modules/localization
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -243,6 +244,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 280d8c1..68b572a 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/m2sci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -164,6 +165,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index f65ef8c..4136feb 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/matio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -236,6 +237,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 93a461e..d1a921b 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libmex_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = modules/mexlib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -205,6 +206,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 97fc2d5..e43b5a2 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/modules_manager
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -165,6 +166,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 9d441c2..c1bd2d7 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/optimization
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -232,6 +233,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 149d7b3..4666f21 100644 (file)
@@ -86,10 +86,11 @@ DIST_COMMON = $(libscioutput_stream_la_include_HEADERS) \
 subdir = modules/output_stream
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -258,6 +259,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index a7f7719..672bab0 100644 (file)
@@ -78,10 +78,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/overloading
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -165,6 +166,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 87bfcbe..a83b838 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(libsciparallel_la_include_HEADERS) \
 subdir = modules/parallel
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -216,6 +217,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 5644d05..7fe103b 100644 (file)
@@ -85,10 +85,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/parameters
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -195,6 +196,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3d2493b..0eb8788 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/polynomials
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -238,6 +239,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 8006747..4d55952 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/prebuildjava
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -139,6 +140,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 5bc2e04..a09d88a 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/preferences
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -239,6 +240,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index dfe7ba1..00a384e 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/randlib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -211,6 +212,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index f6913f6..a32242d 100644 (file)
@@ -90,10 +90,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/renderer
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -203,6 +204,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index ad36606..1acb92b 100644 (file)
@@ -106,10 +106,11 @@ DIST_COMMON = $(am__libsciscicos_la_include_HEADERS_DIST) \
 subdir = modules/scicos
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -446,6 +447,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index ddf2a5d..0731a4f 100644 (file)
@@ -86,10 +86,11 @@ DIST_COMMON = $(am__libsciscicos_blocks_la_include_HEADERS_DIST) \
 subdir = modules/scicos_blocks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -687,6 +688,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 138a18d..324afd7 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/scinotes
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -230,6 +231,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 0a3a885..4bd7ccc 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/signal_processing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -231,6 +232,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 2f37b05..790f2a7 100644 (file)
@@ -82,10 +82,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/simulated_annealing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -169,6 +170,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 3de0a1e..245dfc8 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/sound
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -189,6 +190,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 4ba2ac8..06d0ed0 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/sparse
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -244,6 +245,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index a5c15b7..25adef3 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/special_functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -221,6 +222,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index cf1b04b..69bdf08 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/spreadsheet
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -225,6 +226,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 8ed5afc..900dd85 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/statistics
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -227,6 +228,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 07d0d5d..4fba5be 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/string
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -249,6 +250,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index df5f425..30d479f 100644 (file)
@@ -83,10 +83,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/symbolic
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -210,6 +211,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index f726ca8..ba77720 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/tclsci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -245,6 +246,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index d61803d..1493592 100644 (file)
@@ -80,10 +80,11 @@ DIST_COMMON = $(libscitime_la_include_HEADERS) $(srcdir)/Makefile.am \
 subdir = modules/time
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -203,6 +204,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index d14b4f0..3ff54b7 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/types
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -230,6 +231,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 23aa31f..3308180 100644 (file)
@@ -88,10 +88,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/ui_data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -237,6 +238,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 6efe030..d326adb 100644 (file)
@@ -85,10 +85,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/umfpack
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -238,6 +239,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 0940c0a..259ec43 100644 (file)
@@ -79,10 +79,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/windows_tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -192,6 +193,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 965fc44..dabc3d2 100644 (file)
@@ -87,10 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/xcos
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -238,6 +239,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
index 6216c91..c861d3e 100644 (file)
@@ -85,10 +85,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = modules/xml
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
+       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
        $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -251,6 +252,10 @@ COMMONS_IO = @COMMONS_IO@
 COMMONS_LOGGING = @COMMONS_LOGGING@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CURL_VERSION = @CURL_VERSION@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@