summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-05-03 18:35:33 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-05-05 11:55:35 +0200
commit9088adc407e8546a506f7530f17cc905c2614252 (patch)
tree0fa47a8a5bd84fb48319049e3cfe9a02be3cd78a
parent6d9a63004c6522645d6040d2c60038d90c081034 (diff)
downloadscilab-9088adc407e8546a506f7530f17cc905c2614252.zip
scilab-9088adc407e8546a506f7530f17cc905c2614252.tar.gz
Batik minimal version checked (1.7)
Change-Id: I8e455dd4f35e3c90c3575959a2645e94094a27dd
-rw-r--r--scilab/CHANGES_5.3.X2
-rwxr-xr-xscilab/configure103
-rw-r--r--scilab/configure.ac1
3 files changed, 82 insertions, 24 deletions
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 3a81ff5..743fafe 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -139,7 +139,7 @@ Compilation:
139 139
140* Better detection system of the version of the dependencies 140* Better detection system of the version of the dependencies
141 141
142* Add a check of the minimal installation of hdf5 (1.8.4) 142* Add a check of the minimal installations of hdf5 (1.8.4), batik (1.7)
143 143
144* bug 6643 fixed - --without-gui failed to disable Ocaml build (A xcos 144* bug 6643 fixed - --without-gui failed to disable Ocaml build (A xcos
145 dependency) 145 dependency)
diff --git a/scilab/configure b/scilab/configure
index 89f9bb3..2da2edc 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -13119,6 +13119,63 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
13119 fi 13119 fi
13120 13120
13121 13121
13122 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
13123$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13124 saved_ac_java_classpath=$ac_java_classpath
13125 export ac_java_classpath="$BATIK:$ac_java_classpath"
13126
13127 cat << \EOF > conftest.java
13128// #line 13128 "configure"
13129import org.apache.batik.Version;
13130
13131public class conftest {
13132 public static void main(String[] argv) {
13133 String minVersion="1.7";
13134
13135 System.out.println(Version.getVersion());
13136 if (minVersion.compareTo(Version.getVersion()) > 0) {
13137 System.exit(-1);
13138 }
13139
13140 }
13141}
13142EOF
13143
13144 CLASSPATH=$ac_java_classpath
13145 export CLASSPATH
13146 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13147 if (echo $cmd >&5 ; eval $cmd >&conftest.java.output 2>&5) ; then
13148 if test ""yes"" = "no"; then
13149 echo "yes" >&5
13150 echo "yes"
13151 else
13152 cmd="$JAVA conftest"
13153 if (echo $cmd >&5 ; eval $cmd >&conftest.java.output 2>&5); then
13154 echo "yes" >&5
13155 echo "yes"
13156 else
13157 echo "configure: failed program was:" >&5
13158 cat conftest.java >&5
13159 if test -s conftest.java.output; then
13160 STDOUT=`cat conftest.java.output`
13161 fi
13162 echo "configure: CLASSPATH was $CLASSPATH" >&5
13163 as_fn_error "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
13164 fi
13165 fi
13166 if test -f conftest.java.output; then
13167 rm conftest.java.output
13168 fi
13169 else
13170 echo "configure: failed program was:" >&5
13171 cat conftest.java >&5
13172 echo "configure: CLASSPATH was $CLASSPATH" >&5
13173 as_fn_error "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
13174 fi
13175
13176 ac_java_classpath=$saved_ac_java_classpath
13177
13178
13122 # Commons I/O library 13179 # Commons I/O library
13123 13180
13124 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5 13181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
@@ -13140,7 +13197,7 @@ $as_echo_n "checking commons-io... " >&6; }
13140 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13197 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13141 13198
13142 cat << \EOF > conftest.java 13199 cat << \EOF > conftest.java
13143// #line 13143 "configure" 13200// #line 13200 "configure"
13144import org.apache.commons.io.output.CountingOutputStream; 13201import org.apache.commons.io.output.CountingOutputStream;
13145 13202
13146public class conftest { 13203public class conftest {
@@ -13247,7 +13304,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13247 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13304 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13248 13305
13249 cat << \EOF > conftest.java 13306 cat << \EOF > conftest.java
13250// #line 13250 "configure" 13307// #line 13307 "configure"
13251import org.apache.xmlgraphics.util.Service; 13308import org.apache.xmlgraphics.util.Service;
13252 13309
13253public class conftest { 13310public class conftest {
@@ -13354,7 +13411,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
13354 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13411 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13355 13412
13356 cat << \EOF > conftest.java 13413 cat << \EOF > conftest.java
13357// #line 13357 "configure" 13414// #line 13414 "configure"
13358import org.apache.avalon.framework.configuration.ConfigurationException; 13415import org.apache.avalon.framework.configuration.ConfigurationException;
13359 13416
13360public class conftest { 13417public class conftest {
@@ -13461,7 +13518,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
13461 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13518 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13462 13519
13463 cat << \EOF > conftest.java 13520 cat << \EOF > conftest.java
13464// #line 13464 "configure" 13521// #line 13521 "configure"
13465import org.w3c.dom.svg.SVGDocument; 13522import org.w3c.dom.svg.SVGDocument;
13466 13523
13467public class conftest { 13524public class conftest {
@@ -13568,7 +13625,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
13568 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13625 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13569 13626
13570 cat << \EOF > conftest.java 13627 cat << \EOF > conftest.java
13571// #line 13571 "configure" 13628// #line 13628 "configure"
13572import org.w3c.dom.svg.SVGDocument; 13629import org.w3c.dom.svg.SVGDocument;
13573 13630
13574public class conftest { 13631public class conftest {
@@ -13681,7 +13738,7 @@ $as_echo_n "checking jhdf5... " >&6; }
13681 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13738 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13682 13739
13683 cat << \EOF > conftest.java 13740 cat << \EOF > conftest.java
13684// #line 13684 "configure" 13741// #line 13741 "configure"
13685import ncsa.hdf.hdf5lib.HDF5Constants; 13742import ncsa.hdf.hdf5lib.HDF5Constants;
13686 13743
13687public class conftest { 13744public class conftest {
@@ -13789,7 +13846,7 @@ $as_echo_n "checking commons-logging... " >&6; }
13789 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13846 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13790 13847
13791 cat << \EOF > conftest.java 13848 cat << \EOF > conftest.java
13792// #line 13792 "configure" 13849// #line 13849 "configure"
13793import org.apache.commons.logging.LogFactory; 13850import org.apache.commons.logging.LogFactory;
13794 13851
13795public class conftest { 13852public class conftest {
@@ -13896,7 +13953,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
13896 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13953 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13897 13954
13898 cat << \EOF > conftest.java 13955 cat << \EOF > conftest.java
13899// #line 13899 "configure" 13956// #line 13956 "configure"
13900import org.scilab.forge.jlatexmath.TeXFormula; 13957import org.scilab.forge.jlatexmath.TeXFormula;
13901 13958
13902public class conftest { 13959public class conftest {
@@ -13989,7 +14046,7 @@ $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
13989 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath" 14046 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
13990 14047
13991 cat << \EOF > conftest.java 14048 cat << \EOF > conftest.java
13992// #line 13992 "configure" 14049// #line 14049 "configure"
13993import org.scilab.forge.jlatexmath.TeXFormula; 14050import org.scilab.forge.jlatexmath.TeXFormula;
13994 14051
13995public class conftest { 14052public class conftest {
@@ -14067,7 +14124,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14067 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14124 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14068 14125
14069 cat << \EOF > conftest.java 14126 cat << \EOF > conftest.java
14070// #line 14070 "configure" 14127// #line 14127 "configure"
14071import com.puppycrawl.tools.checkstyle.CheckStyleTask; 14128import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14072 14129
14073public class conftest { 14130public class conftest {
@@ -14174,7 +14231,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14174 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14231 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14175 14232
14176 cat << \EOF > conftest.java 14233 cat << \EOF > conftest.java
14177// #line 14177 "configure" 14234// #line 14234 "configure"
14178import org.apache.commons.beanutils.Converter; 14235import org.apache.commons.beanutils.Converter;
14179 14236
14180public class conftest { 14237public class conftest {
@@ -14281,7 +14338,7 @@ $as_echo_n "checking antlr... " >&6; }
14281 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14338 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14282 14339
14283 cat << \EOF > conftest.java 14340 cat << \EOF > conftest.java
14284// #line 14284 "configure" 14341// #line 14341 "configure"
14285import antlr.TokenStreamException; 14342import antlr.TokenStreamException;
14286 14343
14287public class conftest { 14344public class conftest {
@@ -14388,7 +14445,7 @@ $as_echo_n "checking testng... " >&6; }
14388 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14445 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14389 14446
14390 cat << \EOF > conftest.java 14447 cat << \EOF > conftest.java
14391// #line 14391 "configure" 14448// #line 14448 "configure"
14392import org.testng.TestNG; 14449import org.testng.TestNG;
14393 14450
14394public class conftest { 14451public class conftest {
@@ -14495,7 +14552,7 @@ $as_echo_n "checking qdox... " >&6; }
14495 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14552 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14496 14553
14497 cat << \EOF > conftest.java 14554 cat << \EOF > conftest.java
14498// #line 14498 "configure" 14555// #line 14555 "configure"
14499import com.thoughtworks.qdox.tools.QDoxTester; 14556import com.thoughtworks.qdox.tools.QDoxTester;
14500 14557
14501public class conftest { 14558public class conftest {
@@ -14602,7 +14659,7 @@ $as_echo_n "checking bsh... " >&6; }
14602 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14659 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14603 14660
14604 cat << \EOF > conftest.java 14661 cat << \EOF > conftest.java
14605// #line 14605 "configure" 14662// #line 14662 "configure"
14606import bsh.Console; 14663import bsh.Console;
14607 14664
14608public class conftest { 14665public class conftest {
@@ -14709,7 +14766,7 @@ $as_echo_n "checking junit... " >&6; }
14709 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14766 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14710 14767
14711 cat << \EOF > conftest.java 14768 cat << \EOF > conftest.java
14712// #line 14712 "configure" 14769// #line 14769 "configure"
14713import junit.framework.Assert; 14770import junit.framework.Assert;
14714 14771
14715public class conftest { 14772public class conftest {
@@ -18422,7 +18479,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
18422 export ac_java_classpath="$JHDF5:$ac_java_classpath" 18479 export ac_java_classpath="$JHDF5:$ac_java_classpath"
18423 18480
18424 cat << \EOF > conftest.java 18481 cat << \EOF > conftest.java
18425// #line 18425 "configure" 18482// #line 18482 "configure"
18426import ncsa.hdf.hdf5lib.H5; 18483import ncsa.hdf.hdf5lib.H5;
18427 18484
18428public class conftest { 18485public class conftest {
@@ -22954,7 +23011,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
22954{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 23011{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
22955$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 23012$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
22956cat > conftest.$ac_ext <<EOF 23013cat > conftest.$ac_ext <<EOF
22957#line 22957 "configure" 23014#line 23014 "configure"
22958#include "confdefs.h" 23015#include "confdefs.h"
22959 23016
22960#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 23017#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -23266,7 +23323,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
23266$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 23323$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
23267 23324
23268cat > conftest.$ac_ext <<EOF 23325cat > conftest.$ac_ext <<EOF
23269#line 23269 "configure" 23326#line 23326 "configure"
23270#include "confdefs.h" 23327#include "confdefs.h"
23271 23328
23272#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 23329#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -23850,7 +23907,7 @@ $as_echo_n "checking saxon... " >&6; }
23850 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23907 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23851 23908
23852 cat << \EOF > conftest.java 23909 cat << \EOF > conftest.java
23853// #line 23853 "configure" 23910// #line 23910 "configure"
23854import com.icl.saxon.Loader; 23911import com.icl.saxon.Loader;
23855 23912
23856public class conftest { 23913public class conftest {
@@ -23957,7 +24014,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
23957 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24014 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23958 24015
23959 cat << \EOF > conftest.java 24016 cat << \EOF > conftest.java
23960// #line 23960 "configure" 24017// #line 24017 "configure"
23961import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 24018import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
23962 24019
23963public class conftest { 24020public class conftest {
@@ -30233,7 +30290,7 @@ else
30233 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30290 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
30234 lt_status=$lt_dlunknown 30291 lt_status=$lt_dlunknown
30235 cat > conftest.$ac_ext <<_LT_EOF 30292 cat > conftest.$ac_ext <<_LT_EOF
30236#line 30236 "configure" 30293#line 30293 "configure"
30237#include "confdefs.h" 30294#include "confdefs.h"
30238 30295
30239#if HAVE_DLFCN_H 30296#if HAVE_DLFCN_H
@@ -30339,7 +30396,7 @@ else
30339 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30396 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
30340 lt_status=$lt_dlunknown 30397 lt_status=$lt_dlunknown
30341 cat > conftest.$ac_ext <<_LT_EOF 30398 cat > conftest.$ac_ext <<_LT_EOF
30342#line 30342 "configure" 30399#line 30399 "configure"
30343#include "confdefs.h" 30400#include "confdefs.h"
30344 30401
30345#if HAVE_DLFCN_H 30402#if HAVE_DLFCN_H
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 59c7160..67e20a6 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -812,6 +812,7 @@ the the JNI libraries."])],
812 BATIK=$PACKAGE_JAR_FILE 812 BATIK=$PACKAGE_JAR_FILE
813 fi 813 fi
814 AC_SUBST(BATIK) 814 AC_SUBST(BATIK)
815 AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
815 816
816 # Commons I/O library 817 # Commons I/O library
817 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) 818 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])