diff options
| author | lumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-09-21 13:02:27 +0000 |
|---|---|---|
| committer | lumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-09-21 13:02:27 +0000 |
| commit | 3ee7f61fb70fca90cbcebbe65d54d7f826e613d2 (patch) | |
| tree | 80dbf0ac3ef7825ec34c653a4e398932ea3eaae8 | |
| parent | 0633af5e3be577b0af825e5d921f0bd55d991c8a (diff) | |
| download | mpv-3ee7f61fb70fca90cbcebbe65d54d7f826e613d2.tar.bz2 mpv-3ee7f61fb70fca90cbcebbe65d54d7f826e613d2.tar.xz | |
Fix chunk.xsl autodetection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10913 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | DOCS/xml/configure | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/DOCS/xml/configure b/DOCS/xml/configure index d863954f33..471f618a25 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -37,8 +37,9 @@ done if test -z "$_chunk_xsl" then - echo "Not found." _chunk_xsl=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl + echo "Not found. Using default ($_chunk_xsl)" + _fake_chunk_xsl=yes else echo "Found chunk.xsl at $_chunk_xsl" fi @@ -66,7 +67,7 @@ echo "Looking for a valid XSLT processor..." if xsltproc --version &> /dev/null then - if test -n "$_chunk_xsl" + if test -z "$_fake_chunk_xsl" then echo "Found xsltproc. If it works, it's probably the best choice." if test -n "$_catalog" @@ -86,6 +87,7 @@ fi # FIXME: We need more checks for Java virtual machines. if test -z "$_xsltcommand" then + #FIXME: Add more suitable machines!!! for _try_java in java gij-3.3 gij-3.2 gij-3.1 gij-3.0 gij do if $_try_java --version > /dev/null 2>&1 || $_try_java -version > /dev/null 2>&1 @@ -100,7 +102,7 @@ then else # Try to find the right jar files for classpath. # This must not trigger on something like saxon-fop-6.4.4.jar. - for _try_saxon_jar in /usr/share/java/saxon.jar /usr/local/share/java/saxon.jar /usr/share/java/saxon-[0-9]*.jar /usr/local/share/java/saxon-[0-9]*.jar + for _try_saxon_jar in /usr/share/java/saxon-[0-9]*.jar /usr/local/share/java/saxon-[0-9]*.jar /usr/share/java/saxon.jar /usr/local/share/java/saxon.jar do if test -f "$_try_saxon_jar" then @@ -110,7 +112,7 @@ then done if test -n "$_saxon_jar" then - if test -n "$_chunk_xsl" + if test -z "$_fake_chunk_xsl" then _xsltcommand="cd \$1 && if test \"\`dirname \$2 | head -c 1\`\" = \".\" ; then $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$_IN_DIR/\$2 ; else $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$2 ;fi" echo "Found the Saxon XSLT Processor ($_saxon_jar), using Java VM '$_java'." |