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

Commitf900aff

Browse files
committed
configure check for docbook2man program, used in the new XML-based man
page build target. This covers from-source, Debian, and Fedorainstallation variants.
1 parent15c6706 commitf900aff

File tree

5 files changed

+73
-8
lines changed

5 files changed

+73
-8
lines changed

‎config/docbook.m4‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/docbook.m4,v 1.9 2008/09/05 09:37:37 petere Exp $
1+
# $PostgreSQL: pgsql/config/docbook.m4,v 1.10 2008/11/26 11:26:54 petere Exp $
22

33
# PGAC_PROG_JADE
44
# --------------
@@ -97,3 +97,32 @@ if test -n "$DOCBOOKSTYLE"; then
9797
else
9898
AC_PATH_PROGS(COLLATEINDEX,collateindex.pl)
9999
fi])# PGAC_PATH_COLLATEINDEX
100+
101+
102+
# PGAC_PATH_DOCBOOK2MAN
103+
# ---------------------
104+
# Find docbook2man program from the docbook2X package. Upstream calls
105+
# this program docbook2man, but there is also a different docbook2man
106+
# out there from the docbook-utils package. Thus, the program we want
107+
# is called docbook2x-man on Debian and db2x_docbook2man on Fedora.
108+
#
109+
# (Consider rewriting this macro using AC_PATH_PROGS_FEATURE_CHECK
110+
# when switching to Autoconf 2.62+.)
111+
AC_DEFUN([PGAC_PATH_DOCBOOK2MAN],
112+
[AC_CACHE_CHECK([for docbook2man],[ac_cv_path_DOCBOOK2MAN],
113+
[if test -z "$DOCBOOK2MAN"; then
114+
_AS_PATH_WALK([],
115+
[for ac_prog in docbook2x-man db2x_docbook2man docbook2man; do
116+
ac_path="$as_dir/$ac_prog"
117+
AS_EXECUTABLE_P(["$ac_path"]) || continue
118+
if "$ac_path" --version 2>/dev/null | $GREP docbook2x >/dev/null 2>&1; then
119+
ac_cv_path_DOCBOOK2MAN=$ac_path
120+
break
121+
fi
122+
done])
123+
else
124+
ac_cv_path_DOCBOOK2MAN=$DOCBOOK2MAN
125+
fi])
126+
DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
127+
AC_SUBST(DOCBOOK2MAN)
128+
])# PGAC_PATH_DOCBOOK2MAN

‎configure‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ have_docbook
766766
DOCBOOKSTYLE
767767
COLLATEINDEX
768768
SGMLSPL
769+
DOCBOOK2MAN
769770
vpath_build
770771
LTLIBOBJS'
771772
ac_subst_files=''
@@ -25880,6 +25881,37 @@ fi
2588025881
test -n "$SGMLSPL" && break
2588125882
done
2588225883

25884+
{ echo "$as_me:$LINENO: checking for docbook2man" >&5
25885+
echo $ECHO_N "checking for docbook2man... $ECHO_C" >&6; }
25886+
if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then
25887+
echo $ECHO_N "(cached) $ECHO_C" >&6
25888+
else
25889+
if test -z "$DOCBOOK2MAN"; then
25890+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
25891+
for as_dir in $PATH
25892+
do
25893+
IFS=$as_save_IFS
25894+
test -z "$as_dir" && as_dir=.
25895+
for ac_prog in docbook2x-man db2x_docbook2man docbook2man; do
25896+
ac_path="$as_dir/$ac_prog"
25897+
{ test -f "$ac_path" && $as_test_x "$ac_path"; } || continue
25898+
if "$ac_path" --version 2>/dev/null | $GREP docbook2x >/dev/null 2>&1; then
25899+
ac_cv_path_DOCBOOK2MAN=$ac_path
25900+
break
25901+
fi
25902+
done
25903+
done
25904+
IFS=$as_save_IFS
25905+
25906+
else
25907+
ac_cv_path_DOCBOOK2MAN=$DOCBOOK2MAN
25908+
fi
25909+
fi
25910+
{ echo "$as_me:$LINENO: result: $ac_cv_path_DOCBOOK2MAN" >&5
25911+
echo "${ECHO_T}$ac_cv_path_DOCBOOK2MAN" >&6; }
25912+
DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
25913+
25914+
2588325915

2588425916
# Thread testing
2588525917

@@ -27004,11 +27036,12 @@ have_docbook!$have_docbook$ac_delim
2700427036
DOCBOOKSTYLE!$DOCBOOKSTYLE$ac_delim
2700527037
COLLATEINDEX!$COLLATEINDEX$ac_delim
2700627038
SGMLSPL!$SGMLSPL$ac_delim
27039+
DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim
2700727040
vpath_build!$vpath_build$ac_delim
2700827041
LTLIBOBJS!$LTLIBOBJS$ac_delim
2700927042
_ACEOF
2701027043

27011-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =53; then
27044+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =54; then
2701227045
break
2701327046
elif $ac_last_try; then
2701427047
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

‎configure.in‎

Lines changed: 2 additions & 1 deletion
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 $PostgreSQL: pgsql/configure.in,v 1.573 2008/11/24 09:15:15 mha Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.574 2008/11/26 11:26:54 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1693,6 +1693,7 @@ PGAC_CHECK_DOCBOOK(4.2)
16931693
PGAC_PATH_DOCBOOK_STYLESHEETS
16941694
PGAC_PATH_COLLATEINDEX
16951695
AC_CHECK_PROGS(SGMLSPL, sgmlspl)
1696+
PGAC_PATH_DOCBOOK2MAN
16961697

16971698
# Thread testing
16981699

‎doc/src/sgml/Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# PostgreSQL documentation makefile
44
#
5-
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.112 2008/11/14 10:22:45 petere Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.113 2008/11/26 11:26:54 petere Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -37,6 +37,10 @@ ifndef SGMLSPL
3737
SGMLSPL = sgmlspl
3838
endif
3939

40+
ifndefDOCBOOK2MAN
41+
DOCBOOK2MAN = docbook2man_is_missing
42+
endif
43+
4044
# docbook2man generates man pages from docbook refentry source code.
4145
D2MSCRIPT=$(D2MDIR)/docbook2man-spec.pl
4246
D2MLINKS =$(D2MDIR)/docbook2man-spec_makelinks
@@ -276,9 +280,6 @@ MAKEINFO = makeinfo
276280
## Experimental man page building through docbook2x
277281
##
278282

279-
# called docbook2man on non-Debian
280-
DOCBOOK2MAN = docbook2x-man
281-
282283
manx: postgres.xml stylesheet-man.xsl
283284
$(DOCBOOK2MAN) --solinks -s$(srcdir)/stylesheet-man.xsl --string-param default-manpage-section=$(DEFAULTSECTION)$<
284285
$(mkinstalldirs) man1 man7

‎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-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.246 2008/11/14 10:22:47 petere Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.247 2008/11/26 11:26:54 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -189,6 +189,7 @@ PTHREAD_LIBS= @PTHREAD_LIBS@
189189
have_docbook= @have_docbook@
190190
DOCBOOKSTYLE= @DOCBOOKSTYLE@
191191
COLLATEINDEX= @COLLATEINDEX@
192+
DOCBOOK2MAN= @DOCBOOK2MAN@
192193

193194

194195
##########################################################################

0 commit comments

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