syncing files from 3.0 into HEAD again

(This used to be commit bca0bba209255d0effbae6a3d3b6d298f0952c3a)

1 files changed, 141 insertions, 19 deletions

diff --git a/docs/docbook/configure b/docs/docbook/configure
index 303ea97f57..d51cdfc48c 100755
--- a/docs/docbook/configure
+++ b/docs/docbook/configure
@@ -11,6 +11,12 @@
 ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
+ac_help="$ac_help
+ --enable-crop					    Whether to use a crop template"
+ac_help="$ac_help
+ --with-papersize					Specify papersize (a4paper,letter) "
+ac_help="$ac_help
+ --with-fontsize	              Specify the fontsize in points (default: 10.5) "
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -525,7 +531,7 @@ fi
 # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:529: checking for $ac_word" >&5
+echo "configure:535: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XSLTPROC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -563,7 +569,7 @@ fi
 # Extract the first word of "pdflatex", so it can be a program name with args.
 set dummy pdflatex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:567: checking for $ac_word" >&5
+echo "configure:573: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PDFLATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -598,20 +604,19 @@ fi
 if test "x$PDFLATEX" = x; then
    { echo "configure: error: "pdflatex is required"" 1>&2; exit 1; }
 fi
-
-# Extract the first word of "xmlto", so it can be a program name with args.
-set dummy xmlto; ac_word=$2
+# Extract the first word of "makeindex", so it can be a program name with args.
+set dummy makeindex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:606: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XMLTO'+set}'`\" = set"; then
+echo "configure:611: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$XMLTO" in
+  case "$MAKEINDEX" in
   /*)
-  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
+  ac_cv_path_MAKEINDEX="$MAKEINDEX" # Let the user override the test with a path.
   ;;
   ?:/*)			 
-  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a dos path.
+  ac_cv_path_MAKEINDEX="$MAKEINDEX" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
@@ -619,7 +624,7 @@ else
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_XMLTO="$ac_dir/$ac_word"
+      ac_cv_path_MAKEINDEX="$ac_dir/$ac_word"
       break
     fi
   done
@@ -627,17 +632,52 @@ else
   ;;
 esac
 fi
-XMLTO="$ac_cv_path_XMLTO"
-if test -n "$XMLTO"; then
-  echo "$ac_t""$XMLTO" 1>&6
+MAKEINDEX="$ac_cv_path_MAKEINDEX"
+if test -n "$MAKEINDEX"; then
+  echo "$ac_t""$MAKEINDEX" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
+if test "x$MAKEINDEX" = x; then
+	{ echo "configure: error: "makeindex is required"" 1>&2; exit 1; }
+fi
+
+PAPERSIZE=""
+TEXSTYLESHEET=xslt/latex.xsl
+DUPLICATE_ULINKS=""
+
+CROP="--stringparam docrop 0"
+
+# Check whether --enable-crop or --disable-crop was given.
+if test "${enable_crop+set}" = set; then
+  enableval="$enable_crop"
+   test "$withval" && CROP="--stringparam docrop 1" 
+fi
+
+
+PAPERSIZE="--stringparam papersize a4paper"
+
+# Check whether --with-papersize or --without-papersize was given.
+if test "${with_papersize+set}" = set; then
+  withval="$with_papersize"
+   test "$withval" && PAPERSIZE="--stringparam papersize $withval" 
+fi
+
+
+FONTSIZE="--stringparam fontsize 10.5"
+
+# Check whether --with-fontsize or --without-fontsize was given.
+if test "${with_fontsize+set}" = set; then
+  withval="$with_fontsize"
+   test "$withval" && FONTSIZE="--stringparam fontsize $withval" 
+fi
+
+
 # Extract the first word of "latex", so it can be a program name with args.
 set dummy latex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:641: checking for $ac_word" >&5
+echo "configure:681: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -672,7 +712,7 @@ fi
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:676: checking for $ac_word" >&5
+echo "configure:716: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -707,7 +747,7 @@ fi
 # Extract the first word of "pngtopnm", so it can be a program name with args.
 set dummy pngtopnm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:711: checking for $ac_word" >&5
+echo "configure:751: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PNGTOPNM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -742,7 +782,7 @@ fi
 # Extract the first word of "pnmtops", so it can be a program name with args.
 set dummy pnmtops; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:746: checking for $ac_word" >&5
+echo "configure:786: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PNMTOPS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -774,10 +814,85 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:821: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PERL" in
+  /*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PERL="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+PERL="$ac_cv_path_PERL"
+if test -n "$PERL"; then
+  echo "$ac_t""$PERL" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "xmlto", so it can be a program name with args.
+set dummy xmlto; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:856: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_XMLTO'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$XMLTO" in
+  /*)
+  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_XMLTO="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+XMLTO="$ac_cv_path_XMLTO"
+if test -n "$XMLTO"; then
+  echo "$ac_t""$XMLTO" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 
 
+
+
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -924,12 +1039,19 @@ s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@XSLTPROC@%$XSLTPROC%g
 s%@PDFLATEX@%$PDFLATEX%g
-s%@XMLTO@%$XMLTO%g
+s%@MAKEINDEX@%$MAKEINDEX%g
 s%@LATEX@%$LATEX%g
 s%@DVIPS@%$DVIPS%g
 s%@PNGTOPNM@%$PNGTOPNM%g
 s%@PNMTOPS@%$PNMTOPS%g
+s%@PERL@%$PERL%g
+s%@XMLTO@%$XMLTO%g
 s%@DOC_BUILD_DATE@%$DOC_BUILD_DATE%g
+s%@TEXSTYLESHEET@%$TEXSTYLESHEET%g
+s%@PAPERSIZE@%$PAPERSIZE%g
+s%@DUPLICATE_ULINKS@%$DUPLICATE_ULINKS%g
+s%@FONTSIZE@%$FONTSIZE%g
+s%@CROP@%$CROP%g
 
 CEOF
 EOF