Attachment #219355 for bug #237572




				JROSETTA_ENGINE=$PACKAGE_JAR_FILE
				AC_SUBST(JROSETTA_ENGINE)

	# xml.apache.org SVG Library (under mandriva for example)
	AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
	BATIK=$PACKAGE_JAR_FILE

	if test -z "$BATIK"; then
		# Other other distribs
		AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
		BATIK=$PACKAGE_JAR_FILE
	fi
	AC_SUBST(BATIK)

	# XML to PDF/other Translator
	AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
	FOP=$PACKAGE_JAR_FILE
	AC_SUBST(FOP)

	# MathML rendering solution
	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
	JEUCLID_CORE=$PACKAGE_JAR_FILE
	AC_SUBST(JEUCLID_CORE)

	# Avalon Framework (PDF)
	AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
	AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
	AC_SUBST(AVALON_FRAMEWORK)


				if test $HDF5_ENABLE = yes;  then
				# HDF5 java lib
				  AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])




	if test -z "$DOCBOOK_ROOT"; then
		AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])
	fi
	# xml.apache.org SVG Library (under mandriva for example)
	AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
	BATIK=$PACKAGE_JAR_FILE

	if test -z "$BATIK"; then
		# Other other distribs
		AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
		BATIK=$PACKAGE_JAR_FILE
	fi
	AC_SUBST(BATIK)


	# Saxon XSLT Processor

	SAXON=$PACKAGE_JAR_FILE
	AC_SUBST(SAXON)

	# XML to PDF/other Translator
	AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
	FOP=$PACKAGE_JAR_FILE
	AC_SUBST(FOP)

	# MathML rendering solution
	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
	JEUCLID_CORE=$PACKAGE_JAR_FILE
	AC_SUBST(JEUCLID_CORE)

	# Commons I/O library
	AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
	COMMONS_IO=$PACKAGE_JAR_FILE

	XML_APIS_EXT=$PACKAGE_JAR_FILE
	AC_SUBST(XML_APIS_EXT)


	# Avalon Framework (PDF)
	AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
	AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
	AC_SUBST(AVALON_FRAMEWORK)
	

AC_SUBST(DOCBOOK_ROOT)

Return to bug 237572

Lines 747-752 Link Here

(-)scilab-5.2.0.orig/configure.ac (+27 lines)
747	JROSETTA_ENGINE=$PACKAGE_JAR_FILE	747	JROSETTA_ENGINE=$PACKAGE_JAR_FILE
748	AC_SUBST(JROSETTA_ENGINE)	748	AC_SUBST(JROSETTA_ENGINE)
749		749
		750	# xml.apache.org SVG Library (under mandriva for example)
		751	AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
		752	BATIK=$PACKAGE_JAR_FILE
		753
		754	if test -z "$BATIK"; then
		755	# Other other distribs
		756	AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
		757	BATIK=$PACKAGE_JAR_FILE
		758	fi
		759	AC_SUBST(BATIK)
		760
		761	# XML to PDF/other Translator
		762	AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
		763	FOP=$PACKAGE_JAR_FILE
		764	AC_SUBST(FOP)
		765
		766	# MathML rendering solution
		767	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
		768	JEUCLID_CORE=$PACKAGE_JAR_FILE
		769	AC_SUBST(JEUCLID_CORE)
		770
		771	# Avalon Framework (PDF)
		772	AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
		773	AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
		774	AC_SUBST(AVALON_FRAMEWORK)
		775
		776
750	if test $HDF5_ENABLE = yes; then	777	if test $HDF5_ENABLE = yes; then
751	# HDF5 java lib	778	# HDF5 java lib
752	AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])	779	AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])

Lines 32-47 Link Here

(-)scilab-5.2.0.orig/m4/docbook.m4 (-25 lines)
32	if test -z "$DOCBOOK_ROOT"; then	32	if test -z "$DOCBOOK_ROOT"; then
33	AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])	33	AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])
34	fi	34	fi
35	# xml.apache.org SVG Library (under mandriva for example)
36	AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
37	BATIK=$PACKAGE_JAR_FILE
38
39	if test -z "$BATIK"; then
40	# Other other distribs
41	AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
42	BATIK=$PACKAGE_JAR_FILE
43	fi
44	AC_SUBST(BATIK)
45		35
46		36
47	# Saxon XSLT Processor	37	# Saxon XSLT Processor
Lines 49-64 Link Here
49	SAXON=$PACKAGE_JAR_FILE	39	SAXON=$PACKAGE_JAR_FILE
50	AC_SUBST(SAXON)	40	AC_SUBST(SAXON)
51		41
52	# XML to PDF/other Translator
53	AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
54	FOP=$PACKAGE_JAR_FILE
55	AC_SUBST(FOP)
56
57	# MathML rendering solution
58	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
59	JEUCLID_CORE=$PACKAGE_JAR_FILE
60	AC_SUBST(JEUCLID_CORE)
61
62	# Commons I/O library	42	# Commons I/O library
63	AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])	43	AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
64	COMMONS_IO=$PACKAGE_JAR_FILE	44	COMMONS_IO=$PACKAGE_JAR_FILE
Lines 74-84 Link Here
74	XML_APIS_EXT=$PACKAGE_JAR_FILE	54	XML_APIS_EXT=$PACKAGE_JAR_FILE
75	AC_SUBST(XML_APIS_EXT)	55	AC_SUBST(XML_APIS_EXT)
76		56
77
78	# Avalon Framework (PDF)
79	AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
80	AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
81	AC_SUBST(AVALON_FRAMEWORK)
82		57
83		58
84	AC_SUBST(DOCBOOK_ROOT)	59	AC_SUBST(DOCBOOK_ROOT)