Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2e32eca

Browse files
committed
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 casethe stylesheets might be found through the SGML catalog mechanism.
1 parent08479bc commit2e32eca

File tree

5 files changed

+143
-44
lines changed

5 files changed

+143
-44
lines changed

‎config/docbook.m4

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.2 2002/03/29 17:32:53 petere Exp $
1+
# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.3 2002/04/14 17:23:20 petere Exp $
22

33
# PGAC_PROG_JADE
44
# --------------
@@ -47,7 +47,8 @@ AC_SUBST([have_docbook])
4747
# PGAC_PATH_DOCBOOK_STYLESHEETS
4848
# -----------------------------
4949
AC_DEFUN([PGAC_PATH_DOCBOOK_STYLESHEETS],
50-
[AC_MSG_CHECKING([for DocBook stylesheets])
50+
[AC_ARG_VAR(DOCBOOKSTYLE,[location of DocBook stylesheets])dnl
51+
AC_MSG_CHECKING([for DocBook stylesheets])
5152
AC_CACHE_VAL([pgac_cv_path_stylesheets],
5253
[if test -n "$DOCBOOKSTYLE"; then
5354
pgac_cv_path_stylesheets=$DOCBOOKSTYLE
@@ -57,7 +58,8 @@ else
5758
for pgac_postfix in \
5859
sgml/stylesheets/nwalsh-modular \
5960
sgml/stylesheets/docbook \
60-
sgml/docbook/dsssl/modular
61+
sgml/docbook/dsssl/modular \
62+
sgml/docbook/dsssl-stylesheets
6163
do
6264
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
6365
if test -r "$pgac_candidate/html/docbook.dsl" \
@@ -77,3 +79,15 @@ if test -n "$DOCBOOKSTYLE"; then
7779
else
7880
AC_MSG_RESULT(no)
7981
fi])# PGAC_PATH_DOCBOOK_STYLESHEETS
82+
83+
84+
# PGAC_PATH_COLLATEINDEX
85+
# ----------------------
86+
AC_DEFUN([PGAC_PATH_COLLATEINDEX],
87+
[AC_REQUIRE([PGAC_PATH_DOCBOOK_STYLESHEETS])dnl
88+
if test -n "$DOCBOOKSTYLE"; then
89+
AC_PATH_PROGS(COLLATEINDEX,collateindex.pl,[],
90+
[$DOCBOOKSTYLE/bin $PATH])
91+
else
92+
AC_PATH_PROGS(COLLATEINDEX,collateindex.pl)
93+
fi])# PGAC_PATH_COLLATEINDEX

‎configure

Lines changed: 103 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,10 @@ ac_env_CXXCPP_set=${CXXCPP+set}
769769
ac_env_CXXCPP_value=$CXXCPP
770770
ac_cv_env_CXXCPP_set=${CXXCPP+set}
771771
ac_cv_env_CXXCPP_value=$CXXCPP
772+
ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
773+
ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
774+
ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
775+
ac_cv_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
772776

773777
#
774778
# Report the --help message.
@@ -896,6 +900,8 @@ Some influential environment variables:
896900
CXX C++ compiler command
897901
CXXFLAGS C++ compiler flags
898902
CXXCPP C++ preprocessor
903+
DOCBOOKSTYLE
904+
location of DocBook stylesheets
899905
900906
Use these variables to override the choices made by`configure' or to help
901907
it to find libraries and programs with nonstandard names/locations.
@@ -16399,9 +16405,7 @@ fi
1639916405
test -n"$NSGMLS"&&break
1640016406
done
1640116407
16402-
# If you don't have nsgmls you won't get very far, so save the cycles.
16403-
iftest -n"$NSGMLS";then
16404-
forac_progin openjade jade
16408+
forac_progin openjade jade
1640516409
do
1640616410
# Extract the first word of "$ac_prog", so it can be a program name with args.
1640716411
set dummy$ac_prog; ac_word=$2
@@ -16475,7 +16479,7 @@ echo "${ECHO_T}$pgac_cv_check_docbook" >&6
1647516479
have_docbook=$pgac_cv_check_docbook
1647616480
1647716481
16478-
echo"$as_me:$LINENO: checking for DocBook stylesheets">&5
16482+
echo"$as_me:$LINENO: checking for DocBook stylesheets">&5
1647916483
echo$ECHO_N"checking for DocBook stylesheets...$ECHO_C">&6
1648016484
iftest"${pgac_cv_path_stylesheets+set}" =set;then
1648116485
echo$ECHO_N"(cached)$ECHO_C">&6
@@ -16488,7 +16492,8 @@ else
1648816492
forpgac_postfixin \
1648916493
sgml/stylesheets/nwalsh-modular \
1649016494
sgml/stylesheets/docbook \
16491-
sgml/docbook/dsssl/modular
16495+
sgml/docbook/dsssl/modular \
16496+
sgml/docbook/dsssl-stylesheets
1649216497
do
1649316498
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
1649416499
iftest -r"$pgac_candidate/html/docbook.dsl" \
@@ -16512,7 +16517,98 @@ else
1651216517
echo"$as_me:$LINENO: result: no">&5
1651316518
echo"${ECHO_T}no">&6
1651416519
fi
16515-
forac_progin sgmlspl
16520+
iftest -n"$DOCBOOKSTYLE";then
16521+
forac_progin collateindex.pl
16522+
do
16523+
# Extract the first word of "$ac_prog", so it can be a program name with args.
16524+
set dummy$ac_prog; ac_word=$2
16525+
echo"$as_me:$LINENO: checking for$ac_word">&5
16526+
echo$ECHO_N"checking for$ac_word...$ECHO_C">&6
16527+
iftest"${ac_cv_path_COLLATEINDEX+set}" =set;then
16528+
echo$ECHO_N"(cached)$ECHO_C">&6
16529+
else
16530+
case$COLLATEINDEXin
16531+
[\\/]* |?:[\\/]*)
16532+
ac_cv_path_COLLATEINDEX="$COLLATEINDEX"# Let the user override the test with a path.
16533+
;;
16534+
*)
16535+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16536+
foras_dirin$DOCBOOKSTYLE/bin$PATH
16537+
do
16538+
IFS=$as_save_IFS
16539+
test -z"$as_dir"&& as_dir=.
16540+
forac_exec_extin''$ac_executable_extensions;do
16541+
if$as_executable_p"$as_dir/$ac_word$ac_exec_ext";then
16542+
ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
16543+
echo"$as_me:$LINENO: found$as_dir/$ac_word$ac_exec_ext">&5
16544+
break 2
16545+
fi
16546+
done
16547+
done
16548+
16549+
;;
16550+
esac
16551+
fi
16552+
COLLATEINDEX=$ac_cv_path_COLLATEINDEX
16553+
16554+
iftest -n"$COLLATEINDEX";then
16555+
echo"$as_me:$LINENO: result:$COLLATEINDEX">&5
16556+
echo"${ECHO_T}$COLLATEINDEX">&6
16557+
else
16558+
echo"$as_me:$LINENO: result: no">&5
16559+
echo"${ECHO_T}no">&6
16560+
fi
16561+
16562+
test -n"$COLLATEINDEX"&&break
16563+
done
16564+
16565+
else
16566+
forac_progin collateindex.pl
16567+
do
16568+
# Extract the first word of "$ac_prog", so it can be a program name with args.
16569+
set dummy$ac_prog; ac_word=$2
16570+
echo"$as_me:$LINENO: checking for$ac_word">&5
16571+
echo$ECHO_N"checking for$ac_word...$ECHO_C">&6
16572+
iftest"${ac_cv_path_COLLATEINDEX+set}" =set;then
16573+
echo$ECHO_N"(cached)$ECHO_C">&6
16574+
else
16575+
case$COLLATEINDEXin
16576+
[\\/]* |?:[\\/]*)
16577+
ac_cv_path_COLLATEINDEX="$COLLATEINDEX"# Let the user override the test with a path.
16578+
;;
16579+
*)
16580+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16581+
foras_dirin$PATH
16582+
do
16583+
IFS=$as_save_IFS
16584+
test -z"$as_dir"&& as_dir=.
16585+
forac_exec_extin''$ac_executable_extensions;do
16586+
if$as_executable_p"$as_dir/$ac_word$ac_exec_ext";then
16587+
ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
16588+
echo"$as_me:$LINENO: found$as_dir/$ac_word$ac_exec_ext">&5
16589+
break 2
16590+
fi
16591+
done
16592+
done
16593+
16594+
;;
16595+
esac
16596+
fi
16597+
COLLATEINDEX=$ac_cv_path_COLLATEINDEX
16598+
16599+
iftest -n"$COLLATEINDEX";then
16600+
echo"$as_me:$LINENO: result:$COLLATEINDEX">&5
16601+
echo"${ECHO_T}$COLLATEINDEX">&6
16602+
else
16603+
echo"$as_me:$LINENO: result: no">&5
16604+
echo"${ECHO_T}no">&6
16605+
fi
16606+
16607+
test -n"$COLLATEINDEX"&&break
16608+
done
16609+
16610+
fi
16611+
forac_progin sgmlspl
1651616612
do
1651716613
# Extract the first word of "$ac_prog", so it can be a program name with args.
1651816614
set dummy$ac_prog; ac_word=$2
@@ -16552,7 +16648,6 @@ fi
1655216648
test -n"$SGMLSPL"&&break
1655316649
done
1655416650
16555-
fi
1655616651
1655716652
1655816653
# prepare build tree if outside source tree
@@ -17258,6 +17353,7 @@ s,@NSGMLS@,$NSGMLS,;t t
1725817353
s,@JADE@,$JADE,;t t
1725917354
s,@have_docbook@,$have_docbook,;t t
1726017355
s,@DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t
17356+
s,@COLLATEINDEX@,$COLLATEINDEX,;t t
1726117357
s,@SGMLSPL@,$SGMLSPL,;t t
1726217358
s,@vpath_build@,$vpath_build,;t t
1726317359
CEOF

‎configure.in

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.177 2002/04/10 22:46:31 petere Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.178 2002/04/14 17:23:20 petere Exp $
33

44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1212,13 +1212,11 @@ fi
12121212
# Check for DocBook and tools
12131213
#
12141214
PGAC_PROG_NSGMLS
1215-
# If you don't have nsgmls you won't get very far, so save the cycles.
1216-
if test -n "$NSGMLS"; then
1217-
PGAC_PROG_JADE
1218-
PGAC_CHECK_DOCBOOK([3.1])
1219-
PGAC_PATH_DOCBOOK_STYLESHEETS
1220-
AC_CHECK_PROGS(SGMLSPL, sgmlspl)
1221-
fi
1215+
PGAC_PROG_JADE
1216+
PGAC_CHECK_DOCBOOK([3.1])
1217+
PGAC_PATH_DOCBOOK_STYLESHEETS
1218+
PGAC_PATH_COLLATEINDEX
1219+
AC_CHECK_PROGS(SGMLSPL, sgmlspl)
12221220

12231221

12241222
# prepare build tree if outside source tree

‎doc/src/sgml/Makefile

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.49 2002/01/30 21:54:17 petere Exp $
11+
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.50 2002/04/14 17:23:20 petere Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

@@ -19,12 +19,8 @@ include $(top_builddir)/src/Makefile.global
1919
.SECONDARY:
2020
.NOTPARALLEL:
2121

22-
ifndefDOCBOOKSTYLE
23-
DOCBOOKSTYLE = /home/projects/pgsql/developers/thomas/db162.d/docbook
24-
endif
25-
26-
ifndefDOCBOOKINDEX
27-
DOCBOOKINDEX =$(DOCBOOKSTYLE)/bin/collateindex.pl
22+
ifndefCOLLATEINDEX
23+
COLLATEINDEX =$(DOCBOOKSTYLE)/bin/collateindex.pl
2824
endif
2925

3026
ifndefJADE
@@ -58,7 +54,9 @@ ALLBOOKS = admin developer programmer reference tutorial user
5854

5955
ALLSGML :=$(wildcard$(srcdir)/*.sgml$(srcdir)/ref/*.sgml) bookindex.sgml setindex.sgml
6056

61-
CATALOG =$(DOCBOOKSTYLE)/catalog
57+
ifdefDOCBOOKSTYLE
58+
CATALOG = -c$(DOCBOOKSTYLE)/catalog
59+
endif
6260

6361

6462
##
@@ -84,7 +82,7 @@ man: $(ALLSGML)
8482
## HTML
8583
##
8684

87-
JADE.html =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -i output-html -t sgml
85+
JADE.html =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -i output-html -t sgml
8886

8987
postgres.html: postgres.sgml$(ALLSGML) stylesheet.dsl
9088
@rm -f*.html
@@ -100,22 +98,14 @@ programmer.html: catalogs.gif connections.gif
10098
postgres.html: catalogs.gif connections.gif
10199

102100

103-
COLLATEINDEX =$(PERL)$(DOCBOOKINDEX) -f -g -t 'Index'
101+
COLLATEINDEX:=$(PERL)$(COLLATEINDEX) -f -g -t 'Index'
104102

105103
ifeq (,$(wildcard HTML.index))
106104
bookindex.sgml:
107-
ifeq (,$(wildcard$(COLLATEINDEX)))
108-
touch $@
109-
else
110105
$(COLLATEINDEX) -o$@ -N
111-
endif
112106

113107
setindex.sgml:
114-
ifeq (,$(wildcard$(COLLATEINDEX)))
115-
touch $@
116-
else
117108
$(COLLATEINDEX) -x -o$@ -N
118-
endif
119109
else
120110
bookindex.sgml: HTML.index
121111
$(COLLATEINDEX) -i'bookindex' -o$@$<
@@ -131,19 +121,19 @@ endif
131121

132122
# RTF to allow minor editing for hardcopy
133123
$(addsuffix .rtf,$(ALLBOOKS)):%.rtf:%.sgml$(ALLSGML) stylesheet.dsl
134-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print book-decl.sgml$<
124+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print book-decl.sgml$<
135125

136126
# TeX
137127
# Regular TeX and pdfTeX have slightly differing requirements, so we
138128
# need to distinguish the path we're taking.
139129

140130
$(addsuffix .tex-ps,$(ALLBOOKS)):%.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
141-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o$@ book-decl.sgml$<
131+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o$@ book-decl.sgml$<
142132

143133
programmer.tex-ps: catalogs.eps connections.eps
144134

145135
$(addsuffix .tex-pdf,$(ALLBOOKS)):%.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
146-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o$@ book-decl.sgml$<
136+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o$@ book-decl.sgml$<
147137

148138
programmer.tex-pdf: catalogs.pdf connections.pdf
149139

@@ -168,7 +158,7 @@ programmer.tex-pdf: catalogs.pdf connections.pdf
168158
# for debugging DSSSL code, and possibly to interface to some other
169159
# tools that can make use of this.
170160
$(addsuffix .fot,$(ALLBOOKS)):%.fot:%.sgml$(ALLSGML) stylesheet.dsl
171-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -t fot -i output-print -o$@ book-decl.sgml$<
161+
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t fot -i output-print -o$@ book-decl.sgml$<
172162

173163

174164
# Graphics
@@ -187,7 +177,7 @@ $(addsuffix .fot, $(ALLBOOKS)): %.fot: %.sgml $(ALLSGML) stylesheet.dsl
187177
## Semi-automatic generation of some text files.
188178
##
189179

190-
JADE.text =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)-c$(CATALOG) -d stylesheet.dsl -i output-text -t sgml
180+
JADE.text =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -i output-text -t sgml
191181

192182
INSTALLHISTORYregress_README:% :%.html
193183
@echo"|";\
@@ -219,10 +209,10 @@ regress_README.html: regress.sgml
219209
check:$(addprefix check-,$(ALLBOOKS)) check-postgres
220210

221211
# Quick syntax check without style processing
222-
$(addprefix check-,$(ALLBOOKS)): check-%:%.sgml
212+
$(addprefix check-,$(ALLBOOKS)): check-%:%.sgml bookindex.sgml
223213
$(NSGMLS)$(SGMLINCLUDE) -s book-decl.sgml$<
224214

225-
check-postgres: postgres.sgml
215+
check-postgres: postgres.sgml setindex.sgml
226216
$(NSGMLS)$(SGMLINCLUDE) -s$<
227217

228218

‎src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.145 2002/04/10 16:45:25 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.146 2002/04/14 17:23:20 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -153,6 +153,7 @@ TCLSH= @TCLSH@
153153

154154
have_docbook= @have_docbook@
155155
DOCBOOKSTYLE= @DOCBOOKSTYLE@
156+
COLLATEINDEX= @COLLATEINDEX@
156157

157158

158159
##########################################################################

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp