Make the use of dev-tools easier 39/15539/9
Vincent COUVERT [Mon, 17 Nov 2014 15:15:54 +0000 (16:15 +0100)]
Change-Id: Ifbf43edb3fe4d9b6f8294fd3feec9f141a748216

15 files changed:
scilab/.gitignore
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/m4/curl.m4
scilab/m4/fftw.m4
scilab/m4/hdf5.m4
scilab/m4/java.m4
scilab/m4/libsmath.m4
scilab/m4/libxml2.m4
scilab/m4/pcre.m4
scilab/m4/tcltk.m4
scilab/m4/umfpack.m4
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in

index 30423f1..db8dbb8 100644 (file)
@@ -119,6 +119,7 @@ workspace/
 #
 # scilab/ specific files
 #
+/usr
 /thirdparty
 /include
 Makefile.OBJ
index 0b77b6c..1ff46fe 100755 (executable)
@@ -624,7 +624,7 @@ if test $IS_SCILAB_BINARY -eq 1; then
         TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5"
         TK_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5"
     fi
-    LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:$SCIBINARYBASE/lib/thirdparty/redist
     DOCBOOK_ROOT="$SCI/../../thirdparty/docbook"
     PATH="$PATH:$SCI/modules/scicos/"
 
index 20105a8..32a618f 100755 (executable)
@@ -3127,6 +3127,18 @@ SCI_BUILDDIR="`pwd`"
 SCI_SRCDIR="$srcdir"
 SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
 
+if test -d "$SCI_SRCDIR_FULL/usr"; then
+    WITH_DEVTOOLS=true
+    DEVTOOLS_BINDIR="$SCI_SRCDIR_FULL/usr/bin"
+    DEVTOOLS_INCDIR="$SCI_SRCDIR_FULL/usr/include"
+    DEVTOOLS_LIBDIR="$SCI_SRCDIR_FULL/usr/lib"
+else
+    WITH_DEVTOOLS=false
+    DEVTOOLS_BINDIR=
+    DEVTOOLS_INCDIR=
+    DEVTOOLS_LIBDIR=
+fi
+
 SCILAB_VERSION_MAJOR=5
 SCILAB_VERSION_MINOR=5
 SCILAB_VERSION_MAINTENANCE=2
@@ -6079,7 +6091,8 @@ to "yes", and re-run configure.
 END
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
   fi
-fi # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
+fi
+ # Not using -Werror because we override {C,F}FLAGS in order to disable optimisation
 
 
 
     CFLAGS="$save_CFLAGS"
 else
     HDF5_CFLAGS=""
-    ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf5_h" = xyes; then :
   HDF5_CFLAGS=""
 else
@@ -10348,6 +10364,7 @@ else
 fi
 
 
+    fi
 fi
 
 save_LIBS="$LIBS"
@@ -10404,11 +10421,13 @@ else
   as_fn_error $? "libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen) in $with_hdf5_library. Check if libhdf5 is installed and if the version is correct" "$LINENO" 5
 fi
 
-
 else
-    HDF5_LIBS="-lhdf5 -lhdf5_hl"
-    LIBS="$LIBS $HDF5_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        HDF5_LIBS="-L$DEVTOOLS_LIBDIR -lhdf5 -lhdf5_hl"
+    else
+        HDF5_LIBS="-lhdf5 -lhdf5_hl"
+        LIBS="$LIBS $HDF5_LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
 $as_echo_n "checking for H5Fopen in -lhdf5... " >&6; }
 if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -10457,6 +10476,7 @@ else
 
 fi
 
+    fi
 fi
 
 LIBS="$save_LIBS"
@@ -10914,7 +10934,49 @@ $as_echo "Darwin (Mac OS X) found. Use the standard paths." >&6; }
     esac
     fi
     if test "x$JAVAC" = "x" ; then
-        # Extract the first word of "javac", so it can be a program name with args.
+        if test -d "$SCI_SRCDIR_FULL/java/jdk"; then # Scilab thirparties
+            # Extract the first word of "javac", so it can be a program name with args.
+set dummy javac; 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_path_JAVAC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $JAVAC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in "$SCI_SRCDIR_FULL/java/jdk/bin"
+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_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
+    $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
+
+  ;;
+esac
+fi
+JAVAC=$ac_cv_path_JAVAC
+if test -n "$JAVAC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
+$as_echo "$JAVAC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        else
+            # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -10954,8 +11016,9 @@ $as_echo "no" >&6; }
 fi
 
 
-        if test "x$JAVAC" = "x" ; then
-            as_fn_error $? "javac not found on PATH ... did you try with --with-jdk=DIR" "$LINENO" 5
+            if test "x$JAVAC" = "x" ; then
+                as_fn_error $? "javac not found on PATH ... did you try with --with-jdk=DIR" "$LINENO" 5
+            fi
         fi
     fi
     if test ! -f "$JAVAC" ; then
@@ -11053,7 +11116,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 11056 "configure"
+// #line 11119 "configure"
 import java.util.regex.Pattern;
 
 
@@ -11140,7 +11203,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 11143 "configure"
+// #line 11206 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -11224,7 +11287,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 11227 "configure"
+// #line 11290 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -11289,7 +11352,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 11292 "configure"
+// #line 11355 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -11354,7 +11417,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 11357 "configure"
+// #line 11420 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -11419,7 +11482,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 11422 "configure"
+// #line 11485 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -11484,7 +11547,7 @@ EOF
     # The class java.util.stream.DoubleStream is new to 1.8
 
     cat << \EOF > conftest.java
-// #line 11487 "configure"
+// #line 11550 "configure"
 import java.util.regex.Pattern;
 
 import java.util.stream.DoubleStream;
@@ -12645,6 +12708,102 @@ else
 fi
 
     if test "$ANTPATH" = "no" ; then
+        if test -d "$SCI_SRCDIR_FULL/java/ant"; then # Scilab thirdparties
+            ANTPATH=$SCI_SRCDIR_FULL/java/ant
+
+    if test "$cross_compiling" = "yes" ; then
+        # Extract the first word of "ant", so it can be a program name with args.
+set dummy ant; 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_path_ANT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ANT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ANT="$as_dir/$ac_word$ac_exec_ext"
+    $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
+
+  ;;
+esac
+fi
+ANT=$ac_cv_path_ANT
+if test -n "$ANT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+$as_echo "$ANT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    else
+        # Extract the first word of "ant", so it can be a program name with args.
+set dummy ant; 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_path_ANT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ANT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ANTPATH/bin $ANTPATH
+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_path_ANT="$as_dir/$ac_word$ac_exec_ext"
+    $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
+
+  ;;
+esac
+fi
+ANT=$ac_cv_path_ANT
+if test -n "$ANT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+$as_echo "$ANT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+
+    # Check to see if ANT could not be found
+
+
+    if test "x$ANT" = "x" ; then
+        as_fn_error $? "Cannot find ant" "$LINENO" 5
+    fi
+
+
+        else
 
     if test "$cross_compiling" = "yes" ; then
         # Extract the first word of "ant", so it can be a program name with args.
@@ -12738,6 +12897,7 @@ fi
     fi
 
 
+        fi
     elif test ! -d "$ANTPATH"; then
         as_fn_error $? "--with-ant=DIR option, must pass a valid DIR" "$LINENO" 5
     else
@@ -12865,7 +13025,7 @@ $as_echo_n "checking jgraphx... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12868 "configure"
+// #line 13028 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.model.mxCell;
@@ -12972,7 +13132,7 @@ $as_echo_n "checking minimal version (2.0.0.1) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12975 "configure"
+// #line 13135 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -13044,7 +13204,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13047 "configure"
+// #line 13207 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -13138,7 +13298,7 @@ $as_echo_n "checking scirenderer... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13141 "configure"
+// #line 13301 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13245,7 +13405,7 @@ $as_echo_n "checking minimal version (1.1.0) of scirenderer... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13248 "configure"
+// #line 13408 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13317,7 +13477,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13320 "configure"
+// #line 13480 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13416,7 +13576,7 @@ $as_echo_n "checking flexdock... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13419 "configure"
+// #line 13579 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.docking.DockingManager;
@@ -13523,7 +13683,7 @@ $as_echo_n "checking minimal version (1.2.4) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13526 "configure"
+// #line 13686 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13595,7 +13755,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13598 "configure"
+// #line 13758 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13686,7 +13846,7 @@ $as_echo_n "checking looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13689 "configure"
+// #line 13849 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13803,7 +13963,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13806 "configure"
+// #line 13966 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13921,7 +14081,7 @@ $as_echo_n "checking skinlf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13924 "configure"
+// #line 14084 "configure"
 import java.util.regex.Pattern;
 
 import com.l2fprod.util.AccessUtils;
@@ -14038,7 +14198,7 @@ $as_echo_n "checking jogl2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14041 "configure"
+// #line 14201 "configure"
 import java.util.regex.Pattern;
 
 import javax.media.opengl.glu.GLUnurbs;
@@ -14261,7 +14421,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14264 "configure"
+// #line 14424 "configure"
 import java.util.regex.Pattern;
 
 import jogamp.common.os.MachineDescriptionRuntime;
@@ -14435,7 +14595,7 @@ $as_echo_n "checking jhall... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14438 "configure"
+// #line 14598 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14550,7 +14710,7 @@ $as_echo_n "checking javahelp2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14553 "configure"
+// #line 14713 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14668,7 +14828,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14671 "configure"
+// #line 14831 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14782,7 +14942,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14785 "configure"
+// #line 14945 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14900,7 +15060,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14903 "configure"
+// #line 15063 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -15006,7 +15166,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15009 "configure"
+// #line 15169 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15078,7 +15238,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15081 "configure"
+// #line 15241 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15171,7 +15331,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15174 "configure"
+// #line 15334 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.jeuclid.LayoutContext;
@@ -15290,7 +15450,7 @@ $as_echo_n "checking fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15293 "configure"
+// #line 15453 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.fop.pdf.PDFInfo;
@@ -15414,7 +15574,7 @@ $as_echo_n "checking freehep-graphics2d... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15417 "configure"
+// #line 15577 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphics2d.VectorGraphics;
@@ -15531,7 +15691,7 @@ $as_echo_n "checking freehep-graphicsio-emf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15534 "configure"
+// #line 15694 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphicsio.emf.EMFGraphics2D;
@@ -15648,7 +15808,7 @@ $as_echo_n "checking freehep-graphicsio... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15651 "configure"
+// #line 15811 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphicsio.VectorGraphicsIO;
@@ -15765,7 +15925,7 @@ $as_echo_n "checking freehep-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15768 "configure"
+// #line 15928 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.util.io.XMLSequence;
@@ -15882,7 +16042,7 @@ $as_echo_n "checking freehep-util... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15885 "configure"
+// #line 16045 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.util.StringUtilities;
@@ -16000,7 +16160,7 @@ $as_echo_n "checking batik-all... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16003 "configure"
+// #line 16163 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -16117,7 +16277,7 @@ $as_echo_n "checking batik... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16120 "configure"
+// #line 16280 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -16224,7 +16384,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 16227 "configure"
+// #line 16387 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -16296,7 +16456,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 16299 "configure"
+// #line 16459 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -16387,7 +16547,7 @@ $as_echo_n "checking commons-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16390 "configure"
+// #line 16550 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.output.CountingOutputStream;
@@ -16504,7 +16664,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16507 "configure"
+// #line 16667 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.xmlgraphics.util.Service;
@@ -16621,7 +16781,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16624 "configure"
+// #line 16784 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -16738,7 +16898,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16741 "configure"
+// #line 16901 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16855,7 +17015,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16858 "configure"
+// #line 17018 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16976,7 +17136,7 @@ $as_echo_n "checking commons-logging... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16979 "configure"
+// #line 17139 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
@@ -17093,7 +17253,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17096 "configure"
+// #line 17256 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17200,7 +17360,7 @@ $as_echo_n "checking minimal version (1.0.3) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 17203 "configure"
+// #line 17363 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17272,7 +17432,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 17275 "configure"
+// #line 17435 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17363,7 +17523,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17366 "configure"
+// #line 17526 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -17486,7 +17646,7 @@ $as_echo_n "checking checkstyle... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17489 "configure"
+// #line 17649 "configure"
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -17603,7 +17763,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17606 "configure"
+// #line 17766 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.beanutils.Converter;
@@ -17720,7 +17880,7 @@ $as_echo_n "checking antlr... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17723 "configure"
+// #line 17883 "configure"
 import java.util.regex.Pattern;
 
 import antlr.TokenStreamException;
@@ -17837,7 +17997,7 @@ $as_echo_n "checking junit4... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17840 "configure"
+// #line 18000 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -17951,7 +18111,7 @@ $as_echo_n "checking junit... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17954 "configure"
+// #line 18114 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -18072,7 +18232,7 @@ $as_echo_n "checking cobertura... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18075 "configure"
+// #line 18235 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.cobertura.merge.Main;
@@ -18189,7 +18349,7 @@ $as_echo_n "checking asm3... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18192 "configure"
+// #line 18352 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -18303,7 +18463,7 @@ $as_echo_n "checking asm... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18306 "configure"
+// #line 18466 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -18420,7 +18580,7 @@ $as_echo_n "checking ecj... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18423 "configure"
+// #line 18583 "configure"
 import java.util.regex.Pattern;
 
 import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
@@ -19949,7 +20109,7 @@ $as_echo "$USE_NLS" >&6; }
 
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
 
 
        CFLAGS="$save_CFLAGS"
 else
-       ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        FFTW3_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
 if test "x$ac_cv_header_fftw3_h" = xyes; then :
   FFTW3_CFLAGS=""
 else
@@ -22335,14 +22498,15 @@ else
 fi
 
 
+    fi
 fi
 
 
 # --with-fftw-library set then check in this dir
 if test "x$with_fftw_library" != "xyes"; then
-       save_LIBS="$LIBS"
-       LIBS="-L$with_fftw_library -lfftw3"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
+    save_LIBS="$LIBS"
+    LIBS="-L$with_fftw_library -lfftw3"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
 $as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
 if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -22385,10 +22549,13 @@ else
 
 fi
 
-       LIBS="$save_LIBS"
+    LIBS="$save_LIBS"
 else
-       save_LIBS="$LIBS"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
+    save_LIBS="$LIBS"
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        FFTW3_LIB="-L$DEVTOOLS_LIBDIR -lfftw3"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
 $as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
 if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -22431,7 +22598,8 @@ else
 
 fi
 
-       LIBS="$save_LIBS"
+    fi
+    LIBS="$save_LIBS"
 fi
 
 
 
 
 if test "$with_libxml2" != 'yes' -a "$with_libxml2" != 'no'; then
-   # Look if xml-config xml2_config (which provides cflags and ldflags) is available
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2, for xml-config" >&5
+    # Look if xml-config xml2_config (which provides cflags and ldflags) is available
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2, for xml-config" >&5
 $as_echo_n "checking libxml2, for xml-config... " >&6; }
-   XML_CONFIG="$with_libxml2/bin/xml2-config"
-        if test -x "$XML_CONFIG"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
+    XML_CONFIG="$with_libxml2/bin/xml2-config"
+    if test -x "$XML_CONFIG"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
 $as_echo "$XML_CONFIG" >&6; }
-        else
-                as_fn_error $? "Unable to find $XML_CONFIG. Please check the path you provided" "$LINENO" 5
-               fi
+    else
+        as_fn_error $? "Unable to find $XML_CONFIG. Please check the path you provided" "$LINENO" 5
+    fi
 else
-               for ac_prog in xml2-config
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        XML_CONFIG="$DEVTOOLS_BINDIR/xml2-config"
+    else
+        for ac_prog in xml2-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
 done
 test -n "$XML_CONFIG" || XML_CONFIG="no"
 
-               if test "x$XML_CONFIG" = "xno"; then
-                               as_fn_error $? "Unable to find xml2-config in the path. Please check your installation of libxml2" "$LINENO" 5
-               fi
+    fi
+    if test "x$XML_CONFIG" = "xno"; then
+        as_fn_error $? "Unable to find xml2-config in the path. Please check your installation of libxml2" "$LINENO" 5
+    fi
 fi
 saved_cflags=$CFLAGS
 saved_LIBS="$LIBS"
@@ -23704,11 +23876,11 @@ LIBS="$LIBS $FLIBS"
 
 # First, check BLAS_LIBS environment variable
 if test $acx_blas_ok = no; then
-if test "x$BLAS_LIBS" != x; then
-       save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in $BLAS_LIBS" >&5
+    if test "x$BLAS_LIBS" != x; then
+        save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in $BLAS_LIBS" >&5
 $as_echo_n "checking for $sgemm in $BLAS_LIBS... " >&6; }
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -23741,10 +23913,14 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_blas_ok" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_blas_ok" >&5
 $as_echo "$acx_blas_ok" >&6; }
-       LIBS="$save_LIBS"
-fi
+        LIBS="$save_LIBS"
+    elif $WITH_DEVTOOLS; then # Scilab thirdparties
+        BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas"
+        BLAS_TYPE="Generic Blas"
+        acx_blas_ok=yes
+    fi
 fi
 
 # BLAS linked to by default?  (happens on some supercomputers)
@@ -24715,6 +24891,10 @@ $as_echo "$acx_lapack_ok" >&6; }
         if test acx_lapack_ok = no; then
                 LAPACK_LIBS=""
         fi
+elif $WITH_DEVTOOLS; then # Scilab thirdparties
+     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack"
+     LAPACK_TYPE="Library -llapack"
+     acx_lapack_ok=yes
 fi
 
 # LAPACK linked to by default?  (is sometimes included in BLAS lib)
@@ -24838,7 +25018,13 @@ if test "$with_arpack_library" != no -a "$with_arpack_library" != ""; then
 LDFLAGS="$LDFLAGS -L$with_arpack_library"
 fi
 
-ARPACK_LIBS="-larpack"
+if $WITH_DEVTOOLS; then # Scilab thirdparties
+    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack"
+    LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR"
+    acx_arpack_ok=yes
+else
+    ARPACK_LIBS="-larpack"
+fi
 # Get fortran linker name of ARPACK function to check for.
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 
 # Look in the default paths
 if test "x$UMFPACK_INCLUDE" = "x" ; then
-ac_fn_c_check_header_mongrel "$LINENO" "suitesparse/umfpack.h" "ac_cv_header_suitesparse_umfpack_h" "$ac_includes_default"
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        UMFPACK_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        ac_fn_c_check_header_mongrel "$LINENO" "suitesparse/umfpack.h" "ac_cv_header_suitesparse_umfpack_h" "$ac_includes_default"
 if test "x$ac_cv_header_suitesparse_umfpack_h" = xyes; then :
   SUITESPARSE=yes
 else
@@ -25221,6 +25410,7 @@ fi
 fi
 
 
+    fi
 fi
 
 # --with-umfpack-library set then check in this dir
 
 # check in the default path
 if test $UMFPACK_OK = no; then
-       save_LIBS="$LIBS"
-       LIBS="$BLAS_LIBS $LIBS -lm" # libamd* is mandatory to link umfpack
-       # We need -lm because sometime (ubuntu 7.10 for example) does not link libamd against lib math
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        UMFPACK_LIB="$BLAS_LIBS -L$DEVTOOLS_LIBDIR -lm"
+    else
+        save_LIBS="$LIBS"
+        LIBS="$BLAS_LIBS $LIBS -lm" # libamd* is mandatory to link umfpack
+        # We need -lm because sometime (ubuntu 7.10 for example) does not link libamd against lib math
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5
 $as_echo_n "checking for amd_info in -lamd... " >&6; }
 if ${ac_cv_lib_amd_amd_info+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -25346,8 +25539,8 @@ else
 
 fi
 
-       LIBS="$UMFPACK_LIB $LIBS"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_solve in -lumfpack" >&5
+        LIBS="$UMFPACK_LIB $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umfpack_di_solve in -lumfpack" >&5
 $as_echo_n "checking for umfpack_di_solve in -lumfpack... " >&6; }
 if ${ac_cv_lib_umfpack_umfpack_di_solve+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -25398,7 +25591,8 @@ else
 
 fi
 
-       LIBS="$save_LIBS"
+        LIBS="$save_LIBS"
+    fi
 fi
 
 
 
 
 if test "$with_pcre" != 'yes' -a "$with_pcre" != 'no'; then
-   # Look if pcre-config (which provides cflags and ldflags) is available
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre, for pcre-config" >&5
+    # Look if pcre-config (which provides cflags and ldflags) is available
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre, for pcre-config" >&5
 $as_echo_n "checking pcre, for pcre-config... " >&6; }
-   PCRE_FOUND=0
-   PCRE_CONFIG="$with_pcre/bin/pcre-config"
-        if test -x "$PCRE_CONFIG"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
+    PCRE_FOUND=0
+    PCRE_CONFIG="$with_pcre/bin/pcre-config"
+    if test -x "$PCRE_CONFIG"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
 $as_echo "$PCRE_CONFIG" >&6; }
-                               PCRE_FOUND=1
-               fi
-   if test $PCRE_FOUND -eq 0; then
-   PCRE_CONFIG="$with_pcre/pcre-config"
+        PCRE_FOUND=1
+    fi
+    if test $PCRE_FOUND -eq 0; then
+        PCRE_CONFIG="$with_pcre/pcre-config"
         if test -x "$PCRE_CONFIG"; then
-                               PCRE_FOUND=1
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
+            PCRE_FOUND=1
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
 $as_echo "$PCRE_CONFIG" >&6; }
         fi
-   fi
-               if test $PCRE_FOUND -eq 0; then
-                as_fn_error $? "Unable to find $PCRE_CONFIG. Please check the path you provided" "$LINENO" 5
-               else
-                       unset PCRE_FOUND
-               fi
+    fi
+    if test $PCRE_FOUND -eq 0; then
+        as_fn_error $? "Unable to find $PCRE_CONFIG. Please check the path you provided" "$LINENO" 5
+    else
+        unset PCRE_FOUND
+    fi
 else
-               for ac_prog in pcre-config
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        PCRE_CONFIG="$DEVTOOLS_BINDIR/pcre-config"
+    else
+        for ac_prog in pcre-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
 done
 test -n "$PCRE_CONFIG" || PCRE_CONFIG="no"
 
-               if test "x$PCRE_CONFIG" = "xno"; then
-                               as_fn_error $? "Unable to find pcre-config in the path. Please check your installation of pcre (example : libpcre3 & libpcre3-dev with Debian)" "$LINENO" 5
-               fi
+    fi
+    if test "x$PCRE_CONFIG" = "xno"; then
+        as_fn_error $? "Unable to find pcre-config in the path. Please check your installation of pcre (example : libpcre3 & libpcre3-dev with Debian)" "$LINENO" 5
+    fi
 fi
 saved_cflags="$CFLAGS"
 saved_LIBS="$LIBS"
 
 
 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
+    # 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
+    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"
+        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
+            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
+    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
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        CURL_CONFIG="$DEVTOOLS_BINDIR/curl-config"
+    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
 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
+        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
 fi
 saved_cflags="$CFLAGS"
 saved_LIBS="$LIBS"
@@ -26945,7 +27147,7 @@ fi
   # Check for tcl header file
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for header file tcl.h" >&5
 $as_echo_n "checking for header file tcl.h... " >&6; }
-  dirs="$USER_TCL_INC_PATH /include /usr/include /usr/include/tcl /usr/include/tcl8.5 /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.*  /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include /sw/include"
+  dirs="$USER_TCL_INC_PATH $DEVTOOLS_INCDIR /include /usr/include /usr/include/tcl /usr/include/tcl8.5 /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.*  /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include /sw/include"
   for i in $dirs ; do
        if test -r $i/tcl.h; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i " >&5
@@ -26964,7 +27166,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 26967 "configure"
+#line 27169 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -27070,7 +27272,7 @@ TCL_LIB_OK=0
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION" >&5
 $as_echo_n "checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION... " >&6; }
 MULTIARCH_HOST=`gcc -v 2>&1|grep Target|cut -d" " -f2`
-dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib64 /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ /usr/lib/$MULTIARCH_HOST ."
+dirs="$USER_TCL_LIB_PATH $DEVTOOLS_LIBDIR /lib /usr/lib /usr/lib64 /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ /usr/lib/$MULTIARCH_HOST ."
 libexts="so so.1.0 sl dylib a"
 libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
 for e in $libexts; do
@@ -27254,7 +27456,7 @@ done
 $as_echo_n "checking for header file tk.h... " >&6; }
   TK_LIB_OK=0
   TK_INCLUDE_OK=0
-  dirs="$USER_TK_INC_PATH  /include /usr/include /usr/include/tk /usr/include/tk8.5 /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include  /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include /sw/include /usr/include/tcl8.5 /usr/include/tcl8.*"
+  dirs="$USER_TK_INC_PATH $DEVTOOLS_INCDIR /include /usr/include /usr/include/tk /usr/include/tk8.5 /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include  /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include /sw/include /usr/include/tcl8.5 /usr/include/tcl8.*"
 # /usr/include/tcl8.5 is checked because some distribs store tk headers
 # in /usr/include/tcl8.*
   for i in $dirs ; do
@@ -27275,7 +27477,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 27278 "configure"
+#line 27480 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -27368,7 +27570,7 @@ TK_LIB_OK=0
 $as_echo_n "checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION... " >&6; }
 MULTIARCH_HOST=`gcc -v 2>&1|grep Target|cut -d" " -f2`
 
-dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib64 /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib /usr/lib/$MULTIARCH_HOST ."
+dirs="$USER_TK_LIB_PATH $DEVTOOLS_LIBDIR /lib /usr/lib /usr/lib64 /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib /usr/lib/$MULTIARCH_HOST ."
 libexts="so so.1.0 sl dylib a"
 libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
 
@@ -27610,6 +27812,10 @@ if test "$with_matio" != no; then
       MATIO_CFLAGS="$with_matio_include"
       MATIO_LIBS="$with_matio_library -lm -lz -lmatio -lhdf5"
    else
+      if $WITH_DEVTOOLS; then # Scilab thirdparties
+         MATIO_CFLAGS="-I$DEVTOOLS_INCDIR"
+         MATIO_LIBS="-L$DEVTOOLS_LIBDIR -lm -lz -lmatio -lhdf5"
+      else
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATIO" >&5
@@ -27700,6 +27906,7 @@ else
 $as_echo "yes" >&6; }
        :
 fi
+      fi
    fi
 
    save_CFLAGS="$CFLAGS"
@@ -27859,7 +28066,7 @@ $as_echo_n "checking saxon9he... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 27862 "configure"
+// #line 28069 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -27974,7 +28181,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 27977 "configure"
+// #line 28184 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -28090,7 +28297,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 28093 "configure"
+// #line 28300 "configure"
 import java.util.regex.Pattern;
 
 import com.icl.saxon.Loader;
@@ -45630,6 +45837,8 @@ echo "  Compilation tests (--enable-compilation-tests) ... = $COMPILATION_TESTS"
 echo "  Make the package relocatable (--enable-relocatable)= $RELOCATABLE"
 echo "  Use FFTW (--without-fftw) ........................ = $with_fftw"
 echo "  Use MATIO (--without-matio) ...................... = $with_matio"
+echo ""
+echo "  Compile with Scilab thirdparties ................. = $WITH_DEVTOOLS"
 
 echo ""
 if test "$with_gui" = no; then
@@ -45905,5 +46114,6 @@ echo "  F77 ............ = $F77"
 echo "  FFLAGS ......... = $FFLAGS"
 echo "  SCI_FFLAGS ..... = $SCI_FFLAGS"
 echo "  F77_LDFLAGS .... = $F77_LDFLAGS"
+echo "  FLIBS...... .... = $FLIBS"
 echo "  TERMCAP_LIB .... = $TERMCAP_LIB"
 echo ""
index 6d46a72..d0dc0ab 100644 (file)
@@ -24,6 +24,18 @@ SCI_BUILDDIR="`pwd`"
 SCI_SRCDIR="$srcdir"
 SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
 
+if test -d "$SCI_SRCDIR_FULL/usr"; then
+    WITH_DEVTOOLS=true
+    DEVTOOLS_BINDIR="$SCI_SRCDIR_FULL/usr/bin"
+    DEVTOOLS_INCDIR="$SCI_SRCDIR_FULL/usr/include"
+    DEVTOOLS_LIBDIR="$SCI_SRCDIR_FULL/usr/lib"
+else
+    WITH_DEVTOOLS=false
+    DEVTOOLS_BINDIR=
+    DEVTOOLS_INCDIR=
+    DEVTOOLS_LIBDIR=
+fi
+
 SCILAB_VERSION_MAJOR=5
 SCILAB_VERSION_MINOR=5
 SCILAB_VERSION_MAINTENANCE=2
@@ -1631,7 +1643,12 @@ if test "$with_matio" != no; then
       MATIO_CFLAGS="$with_matio_include"
       MATIO_LIBS="$with_matio_library -lm -lz -lmatio -lhdf5"
    else
-      PKG_CHECK_MODULES(MATIO, [matio >= 1.5.0])
+      if $WITH_DEVTOOLS; then # Scilab thirdparties
+         MATIO_CFLAGS="-I$DEVTOOLS_INCDIR"
+         MATIO_LIBS="-L$DEVTOOLS_LIBDIR -lm -lz -lmatio -lhdf5"
+      else
+         PKG_CHECK_MODULES(MATIO, [matio >= 1.5.0])
+      fi
    fi
 
    save_CFLAGS="$CFLAGS"
@@ -2070,6 +2087,8 @@ echo "  Compilation tests (--enable-compilation-tests) ... = $COMPILATION_TESTS"
 echo "  Make the package relocatable (--enable-relocatable)= $RELOCATABLE"
 echo "  Use FFTW (--without-fftw) ........................ = $with_fftw"
 echo "  Use MATIO (--without-matio) ...................... = $with_matio"
+echo ""
+echo "  Compile with Scilab thirdparties ................. = $WITH_DEVTOOLS"
 
 echo ""
 if test "$with_gui" = no; then
@@ -2345,5 +2364,6 @@ echo "  F77 ............ = $F77"
 echo "  FFLAGS ......... = $FFLAGS"
 echo "  SCI_FFLAGS ..... = $SCI_FFLAGS"
 echo "  F77_LDFLAGS .... = $F77_LDFLAGS"
+echo "  FLIBS...... .... = $FLIBS"
 echo "  TERMCAP_LIB .... = $TERMCAP_LIB"
 echo ""
index d5a84b6..19d1362 100644 (file)
@@ -21,37 +21,41 @@ 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']
-               )
+    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" 
+    # 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
-                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])
+            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
+    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
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        CURL_CONFIG="$DEVTOOLS_BINDIR/curl-config"
+    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
 fi
 saved_cflags="$CFLAGS"
 saved_LIBS="$LIBS"
index 03f36db..ff541eb 100644 (file)
@@ -35,28 +35,36 @@ if test "x$with_fftw_include" != "xyes"; then
        )
        CFLAGS="$save_CFLAGS"
 else
-       AC_CHECK_HEADER([fftw3.h],
-               [FFTW3_CFLAGS=""],
-               [AC_MSG_ERROR([Cannot find headers (fftw3.h) of the library fftw. Please install the dev package (Debian : libfftw3-dev)])])
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        FFTW3_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        AC_CHECK_HEADER([fftw3.h],
+        [FFTW3_CFLAGS=""],
+        [AC_MSG_ERROR([Cannot find headers (fftw3.h) of the library fftw. Please install the dev package (Debian : libfftw3-dev)])])
+    fi
 fi
 
 
 # --with-fftw-library set then check in this dir
 if test "x$with_fftw_library" != "xyes"; then
-       save_LIBS="$LIBS"
-       LIBS="-L$with_fftw_library -lfftw3"
-       AC_CHECK_LIB([fftw3], [fftw_plan_dft_r2c],
-                       [FFTW3_LIB="-L$with_fftw_library -lfftw3"],
-            [AC_MSG_ERROR([libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c) in $with_fftw_library. Check if libfftw3 is installed and if the version is correct])]
-                       )
-       LIBS="$save_LIBS"
+    save_LIBS="$LIBS"
+    LIBS="-L$with_fftw_library -lfftw3"
+    AC_CHECK_LIB([fftw3], [fftw_plan_dft_r2c],
+        [FFTW3_LIB="-L$with_fftw_library -lfftw3"],
+        [AC_MSG_ERROR([libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c) in $with_fftw_library. Check if libfftw3 is installed and if the version is correct])]
+        )
+    LIBS="$save_LIBS"
 else
-       save_LIBS="$LIBS"
-       AC_CHECK_LIB([fftw3], [fftw_plan_dft_r2c],
-                       [FFTW3_LIB="-lfftw3"],
+    save_LIBS="$LIBS"
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        FFTW3_LIB="-L$DEVTOOLS_LIBDIR -lfftw3"
+    else
+        AC_CHECK_LIB([fftw3], [fftw_plan_dft_r2c],
+            [FFTW3_LIB="-lfftw3"],
             [AC_MSG_ERROR([libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c). Check if libfftw3 is installed and if the version is correct])]
-                       )
-       LIBS="$save_LIBS"
+            )
+    fi
+    LIBS="$save_LIBS"
 fi
 AC_SUBST(FFTW3_LIB)
 AC_DEFINE([WITH_FFTW], [], [With the FFTW library])
index aafab57..39815a6 100644 (file)
@@ -28,7 +28,7 @@ AC_ARG_WITH(hdf5_library,
         [with_hdf5_library=$withval],
         [with_hdf5_library='yes']
         )
-        
+
 if test "x$with_hdf5_include" != "xyes"; then
     save_CFLAGS="$CFLAGS"
     CFLAGS="-I$with_hdf5_include"
@@ -39,9 +39,13 @@ if test "x$with_hdf5_include" != "xyes"; then
     CFLAGS="$save_CFLAGS"
 else
     HDF5_CFLAGS=""
-    AC_CHECK_HEADER([hdf5.h],
-        [HDF5_CFLAGS=""],
-        [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        AC_CHECK_HEADER([hdf5.h],
+            [HDF5_CFLAGS=""],
+            [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
+    fi
 fi
 
 save_LIBS="$LIBS"
@@ -55,15 +59,18 @@ if test "x$with_hdf5_library" != "xyes"; then
             [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen) in $with_hdf5_library. Check if libhdf5 is installed and if the version is correct])],
             [-lsz -lz]
             )
-            
 else
-    HDF5_LIBS="-lhdf5 -lhdf5_hl"
-    LIBS="$LIBS $HDF5_LIBS"
-    AC_CHECK_LIB([hdf5], [H5Fopen],
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        HDF5_LIBS="-L$DEVTOOLS_LIBDIR -lhdf5 -lhdf5_hl"
+    else
+        HDF5_LIBS="-lhdf5 -lhdf5_hl"
+        LIBS="$LIBS $HDF5_LIBS"
+        AC_CHECK_LIB([hdf5], [H5Fopen],
             [],
             [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])]
             [-lsz -lz]
             )
+    fi
 fi
 
 LIBS="$save_LIBS"
index c96d443..d6bc91b 100644 (file)
@@ -76,9 +76,13 @@ AC_DEFUN([AC_PROG_JAVAC], [
     esac
     fi
     if test "x$JAVAC" = "x" ; then
-        AC_PATH_PROG(JAVAC, javac)
-        if test "x$JAVAC" = "x" ; then
-            AC_MSG_ERROR([javac not found on PATH ... did you try with --with-jdk=DIR])
+        if test -d "$SCI_SRCDIR_FULL/java/jdk"; then # Scilab thirparties
+            AC_PATH_PROG(JAVAC, javac, ,"$SCI_SRCDIR_FULL/java/jdk/bin")
+        else
+            AC_PATH_PROG(JAVAC, javac)
+            if test "x$JAVAC" = "x" ; then
+                AC_MSG_ERROR([javac not found on PATH ... did you try with --with-jdk=DIR])
+            fi
         fi
     fi
     if test ! -f "$JAVAC" ; then
@@ -811,7 +815,12 @@ AC_DEFUN([AC_JAVA_ANT], [
     AC_HELP_STRING([--with-ant=DIR],[Use ant from DIR]),
     ANTPATH=$withval, ANTPATH=no)
     if test "$ANTPATH" = "no" ; then
-        AC_JAVA_TOOLS_CHECK(ANT, ant)
+        if test -d "$SCI_SRCDIR_FULL/java/ant"; then # Scilab thirdparties
+            ANTPATH=$SCI_SRCDIR_FULL/java/ant
+            AC_JAVA_TOOLS_CHECK(ANT, ant, $ANTPATH/bin $ANTPATH)
+        else
+            AC_JAVA_TOOLS_CHECK(ANT, ant)
+        fi
     elif test ! -d "$ANTPATH"; then
         AC_MSG_ERROR([--with-ant=DIR option, must pass a valid DIR])
     else
index c599574..0546ce1 100644 (file)
@@ -56,13 +56,17 @@ LIBS="$LIBS $FLIBS"
 
 # First, check BLAS_LIBS environment variable
 if test $acx_blas_ok = no; then
-if test "x$BLAS_LIBS" != x; then
-       save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-       AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-       AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes; BLAS_TYPE="Using BLAS_LIBS environment variable"], [BLAS_LIBS=""])
-       AC_MSG_RESULT($acx_blas_ok)
-       LIBS="$save_LIBS"
-fi
+    if test "x$BLAS_LIBS" != x; then
+        save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
+        AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
+        AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes; BLAS_TYPE="Using BLAS_LIBS environment variable"], [BLAS_LIBS=""])
+        AC_MSG_RESULT($acx_blas_ok)
+        LIBS="$save_LIBS"
+    elif $WITH_DEVTOOLS; then # Scilab thirdparties
+        BLAS_LIBS="-L$DEVTOOLS_LIBDIR -lblas"
+        BLAS_TYPE="Generic Blas"
+        acx_blas_ok=yes
+    fi
 fi
 
 # BLAS linked to by default?  (happens on some supercomputers)
@@ -230,6 +234,10 @@ if test "x$LAPACK_LIBS" != x; then
         if test acx_lapack_ok = no; then
                 LAPACK_LIBS=""
         fi
+elif $WITH_DEVTOOLS; then # Scilab thirdparties
+     LAPACK_LIBS="-L$DEVTOOLS_LIBDIR -llapack"
+     LAPACK_TYPE="Library -llapack"
+     acx_lapack_ok=yes
 fi
 
 # LAPACK linked to by default?  (is sometimes included in BLAS lib)
@@ -316,7 +324,13 @@ if test "$with_arpack_library" != no -a "$with_arpack_library" != ""; then
 LDFLAGS="$LDFLAGS -L$with_arpack_library"
 fi
 
-ARPACK_LIBS="-larpack"
+if $WITH_DEVTOOLS; then # Scilab thirdparties
+    ARPACK_LIBS="-L$DEVTOOLS_LIBDIR -larpack"
+    LDFLAGS="$LDFLAGS -L$DEVTOOLS_LIBDIR"
+    acx_arpack_ok=yes
+else
+    ARPACK_LIBS="-larpack"
+fi
 # Get fortran linker name of ARPACK function to check for.
 AC_F77_FUNC(znaupd)
 
index 7176596..e434967 100644 (file)
@@ -23,23 +23,27 @@ AC_ARG_WITH(libxml2,
                )
 
 if test "$with_libxml2" != 'yes' -a "$with_libxml2" != 'no'; then
-   # Look if xml-config xml2_config (which provides cflags and ldflags) is available
-   AC_MSG_CHECKING([libxml2, for xml-config])
-   XML_CONFIG="$with_libxml2/bin/xml2-config" 
-        if test -x "$XML_CONFIG"; then
-                AC_MSG_RESULT([$XML_CONFIG])
-        else
-                AC_MSG_ERROR([Unable to find $XML_CONFIG. Please check the path you provided])
-               fi
+    # Look if xml-config xml2_config (which provides cflags and ldflags) is available
+    AC_MSG_CHECKING([libxml2, for xml-config])
+    XML_CONFIG="$with_libxml2/bin/xml2-config"
+    if test -x "$XML_CONFIG"; then
+        AC_MSG_RESULT([$XML_CONFIG])
+    else
+        AC_MSG_ERROR([Unable to find $XML_CONFIG. Please check the path you provided])
+    fi
 else
-               AC_CHECK_PROGS(XML_CONFIG,xml2-config,no)
-               if test "x$XML_CONFIG" = "xno"; then
-                               AC_MSG_ERROR([Unable to find xml2-config in the path. Please check your installation of libxml2])
-               fi
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        XML_CONFIG="$DEVTOOLS_BINDIR/xml2-config"
+    else
+        AC_CHECK_PROGS(XML_CONFIG,xml2-config,no)
+    fi
+    if test "x$XML_CONFIG" = "xno"; then
+        AC_MSG_ERROR([Unable to find xml2-config in the path. Please check your installation of libxml2])
+    fi
 fi
 saved_cflags=$CFLAGS
 saved_LIBS="$LIBS"
-               
+
 XML_FLAGS=`$XML_CONFIG --cflags`
 XML_LIBS=`$XML_CONFIG --libs`
 XML_VERSION=`$XML_CONFIG --version`
@@ -77,7 +81,7 @@ AC_DEFINE_UNQUOTED([LIBXML_LIBS],["$XML_LIBS"],[libXML2 library])
 #AC_CHECK_LIB(xml2,xmlInitParserCtxt,,[AC_MSG_ERROR([libxml2 : library missing])])
 
 
-#AC_CHECK_HEADERS([libxml/tree.h],,[AC_MSG_ERROR([libxml2 : library missing missing])])        
+#AC_CHECK_HEADERS([libxml/tree.h],,[AC_MSG_ERROR([libxml2 : library missing missing])])
 
 # Gets compilation and library flags
 ])
index 876f4d3..d859fe6 100644 (file)
@@ -21,41 +21,45 @@ AC_DEFUN([AC_PCRE], [
 
 
 AC_ARG_WITH(pcre,
-               AC_HELP_STRING([--with-pcre=DIR],[Set the path to your PCRE (Perl 5 Compatible Regular Expression Library) installation]),
-               [with_pcre=$withval],
-               [with_pcre='yes']
-               )
+    AC_HELP_STRING([--with-pcre=DIR],[Set the path to your PCRE (Perl 5 Compatible Regular Expression Library) installation]),
+    [with_pcre=$withval],
+    [with_pcre='yes']
+    )
 
 if test "$with_pcre" != 'yes' -a "$with_pcre" != 'no'; then
-   # Look if pcre-config (which provides cflags and ldflags) is available
-   AC_MSG_CHECKING([pcre, for pcre-config])
-   PCRE_FOUND=0
-   PCRE_CONFIG="$with_pcre/bin/pcre-config" 
+    # Look if pcre-config (which provides cflags and ldflags) is available
+    AC_MSG_CHECKING([pcre, for pcre-config])
+    PCRE_FOUND=0
+    PCRE_CONFIG="$with_pcre/bin/pcre-config"
+    if test -x "$PCRE_CONFIG"; then
+        AC_MSG_RESULT([$PCRE_CONFIG])
+        PCRE_FOUND=1
+    fi
+    if test $PCRE_FOUND -eq 0; then
+        PCRE_CONFIG="$with_pcre/pcre-config"
         if test -x "$PCRE_CONFIG"; then
-                AC_MSG_RESULT([$PCRE_CONFIG])
-                               PCRE_FOUND=1
-               fi
-   if test $PCRE_FOUND -eq 0; then
-   PCRE_CONFIG="$with_pcre/pcre-config" 
-        if test -x "$PCRE_CONFIG"; then
-                               PCRE_FOUND=1
-                AC_MSG_RESULT([$PCRE_CONFIG])
+            PCRE_FOUND=1
+            AC_MSG_RESULT([$PCRE_CONFIG])
         fi
-   fi
-               if test $PCRE_FOUND -eq 0; then
-                AC_MSG_ERROR([Unable to find $PCRE_CONFIG. Please check the path you provided])
-               else
-                       unset PCRE_FOUND
-               fi
+    fi
+    if test $PCRE_FOUND -eq 0; then
+        AC_MSG_ERROR([Unable to find $PCRE_CONFIG. Please check the path you provided])
+    else
+        unset PCRE_FOUND
+    fi
 else
-               AC_CHECK_PROGS(PCRE_CONFIG,pcre-config,no)
-               if test "x$PCRE_CONFIG" = "xno"; then
-                               AC_MSG_ERROR([Unable to find pcre-config in the path. Please check your installation of pcre (example : libpcre3 & libpcre3-dev with Debian)])
-               fi
+    if $WITH_DEVTOOLS; then # Scilab thirdparties
+        PCRE_CONFIG="$DEVTOOLS_BINDIR/pcre-config"
+    else
+        AC_CHECK_PROGS(PCRE_CONFIG,pcre-config,no)
+    fi
+    if test "x$PCRE_CONFIG" = "xno"; then
+        AC_MSG_ERROR([Unable to find pcre-config in the path. Please check your installation of pcre (example : libpcre3 & libpcre3-dev with Debian)])
+    fi
 fi
 saved_cflags="$CFLAGS"
 saved_LIBS="$LIBS"
-               
+
 PCRE_CFLAGS=`$PCRE_CONFIG --cflags`
 PCRE_LIBS=`$PCRE_CONFIG --libs-posix`
 PCRE_VERSION=`$PCRE_CONFIG --version`
index dd868ca..5a9e70d 100644 (file)
@@ -133,7 +133,7 @@ CHK_TCL_MIN=$2
 TCL_LIB_OK=0
   AC_MSG_CHECKING([for tcl library tcl$1.$2])
 MULTIARCH_HOST=`gcc -v 2>&1|grep Target|cut -d" " -f2`
-dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib64 /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ /usr/lib/$MULTIARCH_HOST ."
+dirs="$USER_TCL_LIB_PATH $DEVTOOLS_LIBDIR /lib /usr/lib /usr/lib64 /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ /usr/lib/$MULTIARCH_HOST ."
 libexts="so so.1.0 sl dylib a"
 libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
 for e in $libexts; do
@@ -296,7 +296,7 @@ TK_LIB_OK=0
 AC_MSG_CHECKING([for tk library tk$1.$2])
 MULTIARCH_HOST=`gcc -v 2>&1|grep Target|cut -d" " -f2`
 
-dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib64 /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib /usr/lib/$MULTIARCH_HOST ."
+dirs="$USER_TK_LIB_PATH $DEVTOOLS_LIBDIR /lib /usr/lib /usr/lib64 /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib /usr/lib/$MULTIARCH_HOST ."
 libexts="so so.1.0 sl dylib a"
 libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
 
@@ -394,7 +394,7 @@ dnl In addition, if the test was OK, the WITH_TK cpp symbol is defined
   TCL_INCLUDE_OK=0
   # Check for tcl header file
   AC_MSG_CHECKING([for header file tcl.h])
-  dirs="$USER_TCL_INC_PATH /include /usr/include /usr/include/tcl /usr/include/tcl8.5 /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.*  /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include /sw/include"
+  dirs="$USER_TCL_INC_PATH $DEVTOOLS_INCDIR /include /usr/include /usr/include/tcl /usr/include/tcl8.5 /usr/include/tcl8.* /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.*  /usr/X11/include/tcl /usr/X11/include/tcl8.* /usr/include/X11 /usr/include/X11/tcl /usr/include/X11/tcl8.* ../include ../../include /usr/tcl /usr/local/tcl /usr/local/tcl/include /usr/tcl/include /sw/include"
   for i in $dirs ; do
        if test -r $i/tcl.h; then 
                AC_MSG_RESULT([found in $i ])
@@ -426,7 +426,7 @@ dnl In addition, if the test was OK, the WITH_TK cpp symbol is defined
   AC_MSG_CHECKING([for header file tk.h])
   TK_LIB_OK=0
   TK_INCLUDE_OK=0
-  dirs="$USER_TK_INC_PATH  /include /usr/include /usr/include/tk /usr/include/tk8.5 /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include  /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include /sw/include /usr/include/tcl8.5 /usr/include/tcl8.*"
+  dirs="$USER_TK_INC_PATH $DEVTOOLS_INCDIR /include /usr/include /usr/include/tk /usr/include/tk8.5 /usr/include/tk8.* /usr/local/include /usr/local/include/tk /usr/local/include/tk8.* /usr/X11/include/tk /usr/X11/include/tk8.* /usr/include/X11 /usr/include/X11/tk /usr/include/X11/tk8.* ../include ../../include /usr/tk /usr/local/tk /usr/local/tk/include /usr/tk/include  /usr/local/tcl /usr/tcl /usr/tcl/include /usr/local/tcl/include /sw/include /usr/include/tcl8.5 /usr/include/tcl8.*"
 # /usr/include/tcl8.5 is checked because some distribs store tk headers
 # in /usr/include/tcl8.*
   for i in $dirs ; do
index 45c3b94..26d8563 100644 (file)
@@ -47,15 +47,19 @@ if test "x$with_umfpack_include" != "xyes"; then
 fi
 
 # Look in the default paths
-if test "x$UMFPACK_INCLUDE" = "x" ; then 
-AC_CHECK_HEADER([suitesparse/umfpack.h],
-       [SUITESPARSE=yes],
-       [AC_CHECK_HEADER(
-                               [umfpack.h],
-                               [SUITESPARSE=no],
-                               [AC_MSG_ERROR([Cannot find headers (umfpack.h) of the library UMFPACK. Please install the dev package (Debian : libsuitesparse-dev)])
-       ])
-       ])
+if test "x$UMFPACK_INCLUDE" = "x" ; then
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        UMFPACK_CFLAGS="-I$DEVTOOLS_INCDIR"
+    else
+        AC_CHECK_HEADER([suitesparse/umfpack.h],
+            [SUITESPARSE=yes],
+            [AC_CHECK_HEADER(
+                [umfpack.h],
+                [SUITESPARSE=no],
+                [AC_MSG_ERROR([Cannot find headers (umfpack.h) of the library UMFPACK. Please install the dev package (Debian : libsuitesparse-dev)])
+                ])
+            ])
+    fi
 fi
 
 # --with-umfpack-library set then check in this dir
@@ -77,26 +81,30 @@ fi
 
 # check in the default path
 if test $UMFPACK_OK = no; then
-       save_LIBS="$LIBS"
-       LIBS="$BLAS_LIBS $LIBS -lm" # libamd* is mandatory to link umfpack
-       # We need -lm because sometime (ubuntu 7.10 for example) does not link libamd against lib math
+    if $WITH_DEVTOOLS; then # Scilab thirparties
+        UMFPACK_LIB="$BLAS_LIBS -L$DEVTOOLS_LIBDIR -lm"
+    else
+        save_LIBS="$LIBS"
+        LIBS="$BLAS_LIBS $LIBS -lm" # libamd* is mandatory to link umfpack
+        # We need -lm because sometime (ubuntu 7.10 for example) does not link libamd against lib math
 
-       AC_CHECK_LIB([amd], [amd_info],
-                       [UMFPACK_LIB="-lamd"],
+        AC_CHECK_LIB([amd], [amd_info],
+            [UMFPACK_LIB="-lamd"],
             [AC_MSG_ERROR([libamd: Library missing (Cannot find symbol amd_info). Check if libamd (sparse matrix minimum degree ordering) is installed and if the version is correct])]
-                       )
-       LIBS="$UMFPACK_LIB $LIBS"
-       AC_CHECK_LIB([umfpack], [umfpack_di_solve],
-                       [UMFPACK_LIB="-lumfpack $UMFPACK_LIB"; UMFPACK_OK=yes],
+            )
+        LIBS="$UMFPACK_LIB $LIBS"
+        AC_CHECK_LIB([umfpack], [umfpack_di_solve],
+            [UMFPACK_LIB="-lumfpack $UMFPACK_LIB"; UMFPACK_OK=yes],
             [AC_MSG_ERROR([libumfpack: Library missing. (Cannot find symbol umfpack_di_solve). Check if libumfpack is installed and if the version is correct (also called lib suitesparse)])]
-                       )
-       LIBS="$save_LIBS"
+            )
+        LIBS="$save_LIBS"
+    fi
 fi
 
 AC_SUBST(UMFPACK_LIB)
 AC_SUBST(UMFPACK_CFLAGS)
 if test $SUITESPARSE = yes; then
-       AC_DEFINE_UNQUOTED([UMFPACK_SUITESPARSE],[] , [If it is UMFPACK/Suitesparse or UMFPACK standalone])
+   AC_DEFINE_UNQUOTED([UMFPACK_SUITESPARSE],[] , [If it is UMFPACK/Suitesparse or UMFPACK standalone])
 fi
 
 AC_DEFINE([WITH_UMFPACK], [], [With the UMFPACK library])
index 22bcce8..b0480fa 100644 (file)
@@ -118,7 +118,8 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/preferences/includes/ \
-                           $(XML_FLAGS) \
+                               $(XML_FLAGS) \
+                               $(CURL_CFLAGS) \
                                $(AM_CPPFLAGS)
 
 if MAINTAINER_MODE
index 7a7803b..176526e 100644 (file)
@@ -737,7 +737,8 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/preferences/includes/ \
-                           $(XML_FLAGS) \
+                               $(XML_FLAGS) \
+                               $(CURL_CFLAGS) \
                                $(AM_CPPFLAGS)
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscifileio.la