merge from 2.2

(This used to be commit 6270765ed5d4e94d34af6d512f17f403b9624699)

1 files changed, 36 insertions, 0 deletions

diff --git a/docs/docbook/configure b/docs/docbook/configure
index 5745489fdb..b2403428a2 100755
--- a/docs/docbook/configure
+++ b/docs/docbook/configure
@@ -739,6 +739,41 @@ 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:746: 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
+
 
 SGML_SHARE="/usr/local/share/sgml"
 
@@ -915,6 +950,7 @@ s%@NSGMLS@%$NSGMLS%g
 s%@HTMLDOC@%$HTMLDOC%g
 s%@ONSGMLS@%$ONSGMLS%g
 s%@SGMLSPL@%$SGMLSPL%g
+s%@PERL@%$PERL%g
 s%@SGML_SHARE@%$SGML_SHARE%g
 s%@DOC_BUILD_DATE@%$DOC_BUILD_DATE%g