mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Allow detection of collateindex.pl in stylesheet directory or in path,
which covers some recent installation schemes. Add Mandrake installation layout to directories to check for stylesheets. Allow documentation build to proceed if stylesheets were not found, in case the stylesheets might be found through the SGML catalog mechanism.
This commit is contained in:
Peter Eisentraut
110
configure
vendored
110
configure
vendored
@ -769,6 +769,10 @@ ac_env_CXXCPP_set=${CXXCPP+set}
|
||||
ac_env_CXXCPP_value=$CXXCPP
|
||||
ac_cv_env_CXXCPP_set=${CXXCPP+set}
|
||||
ac_cv_env_CXXCPP_value=$CXXCPP
|
||||
ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
|
||||
ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
|
||||
ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
|
||||
ac_cv_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
|
||||
|
||||
#
|
||||
# Report the --help message.
|
||||
@ -896,6 +900,8 @@ Some influential environment variables:
|
||||
CXX C++ compiler command
|
||||
CXXFLAGS C++ compiler flags
|
||||
CXXCPP C++ preprocessor
|
||||
DOCBOOKSTYLE
|
||||
location of DocBook stylesheets
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@ -16399,9 +16405,7 @@ fi
|
||||
test -n "$NSGMLS" && break
|
||||
done
|
||||
|
||||
# If you don't have nsgmls you won't get very far, so save the cycles.
|
||||
if test -n "$NSGMLS"; then
|
||||
for ac_prog in openjade jade
|
||||
for ac_prog in openjade jade
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -16475,7 +16479,7 @@ echo "${ECHO_T}$pgac_cv_check_docbook" >&6
|
||||
have_docbook=$pgac_cv_check_docbook
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for DocBook stylesheets" >&5
|
||||
echo "$as_me:$LINENO: checking for DocBook stylesheets" >&5
|
||||
echo $ECHO_N "checking for DocBook stylesheets... $ECHO_C" >&6
|
||||
if test "${pgac_cv_path_stylesheets+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -16488,7 +16492,8 @@ else
|
||||
for pgac_postfix in \
|
||||
sgml/stylesheets/nwalsh-modular \
|
||||
sgml/stylesheets/docbook \
|
||||
sgml/docbook/dsssl/modular
|
||||
sgml/docbook/dsssl/modular \
|
||||
sgml/docbook/dsssl-stylesheets
|
||||
do
|
||||
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
|
||||
if test -r "$pgac_candidate/html/docbook.dsl" \
|
||||
@ -16512,7 +16517,98 @@ else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
for ac_prog in sgmlspl
|
||||
if test -n "$DOCBOOKSTYLE"; then
|
||||
for ac_prog in collateindex.pl
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $COLLATEINDEX in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_COLLATEINDEX="$COLLATEINDEX" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $DOCBOOKSTYLE/bin $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
COLLATEINDEX=$ac_cv_path_COLLATEINDEX
|
||||
|
||||
if test -n "$COLLATEINDEX"; then
|
||||
echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
|
||||
echo "${ECHO_T}$COLLATEINDEX" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$COLLATEINDEX" && break
|
||||
done
|
||||
|
||||
else
|
||||
for ac_prog in collateindex.pl
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_COLLATEINDEX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $COLLATEINDEX in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_COLLATEINDEX="$COLLATEINDEX" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
COLLATEINDEX=$ac_cv_path_COLLATEINDEX
|
||||
|
||||
if test -n "$COLLATEINDEX"; then
|
||||
echo "$as_me:$LINENO: result: $COLLATEINDEX" >&5
|
||||
echo "${ECHO_T}$COLLATEINDEX" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$COLLATEINDEX" && break
|
||||
done
|
||||
|
||||
fi
|
||||
for ac_prog in sgmlspl
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -16552,7 +16648,6 @@ fi
|
||||
test -n "$SGMLSPL" && break
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# prepare build tree if outside source tree
|
||||
@ -17258,6 +17353,7 @@ s,@NSGMLS@,$NSGMLS,;t t
|
||||
s,@JADE@,$JADE,;t t
|
||||
s,@have_docbook@,$have_docbook,;t t
|
||||
s,@DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t
|
||||
s,@COLLATEINDEX@,$COLLATEINDEX,;t t
|
||||
s,@SGMLSPL@,$SGMLSPL,;t t
|
||||
s,@vpath_build@,$vpath_build,;t t
|
||||
CEOF
|
||||
|
||||
Reference in New Issue
Block a user