pgpool2.git / summary / log / commit / refs
commit 99ae8206434b1be7ce2e6ef22707094519f8a259
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Mon Nov 07 08:53:37 2016 +0000
Allow to create man pages from SGML.
For this purpose, following changes are made:
- Allow to properly create pgpool.xml. For this purpose, add checking
for xmllint to configure.ac.
- Fix m4/docbook.m4 to not throw an error and properly set
DOCKBOOKSTYLE variable. (not sure if this is related to the fix
though. Anyway, this seems suppress shell errors while configure)
- Allow osx to process UTF-8 documents in doc.ja directory.
- Fix SGML tags in start.sgml and installation.sgml to suppress XML
validation errors generated by xmllint.
Makefile.in | 1 +
configure | 45 ++++++++++++++++++++++++++++++++++++++-
configure.ac | 1 +
doc.ja/Makefile.in | 1 +
doc.ja/src/Makefile.in | 1 +
doc.ja/src/sgml/Makefile.am | 5 +++--
doc.ja/src/sgml/Makefile.in | 6 ++++--
doc.ja/src/sgml/installation.sgml | 3 ---
doc.ja/src/sgml/start.sgml | 2 +-
doc.ja/src/sgml/version.sgml | 2 +-
doc/Makefile.in | 1 +
doc/src/Makefile.in | 1 +
doc/src/sgml/Makefile.am | 4 ++--
doc/src/sgml/Makefile.in | 5 +++--
doc/src/sgml/installation.sgml | 3 ---
doc/src/sgml/start.sgml | 2 +-
doc/src/sgml/version.sgml | 2 +-
m4/docbook.m4 | 2 +-
src/Makefile.in | 1 +
src/include/Makefile.in | 1 +
src/libs/Makefile.in | 1 +
src/libs/pcp/Makefile.in | 1 +
src/parser/Makefile.in | 1 +
src/tools/Makefile.in | 1 +
src/tools/pcp/Makefile.in | 1 +
src/tools/pgmd5/Makefile.in | 1 +
src/watchdog/Makefile.in | 1 +
27 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index a54397743..120c9e7ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -279,6 +279,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/configure b/configure
index c72b30017..2561ad98f 100755
--- a/configure
+++ b/configure
@@ -653,6 +653,7 @@ XSLTPROC_HTML_FLAGS
LYNX
PERL
OSX
+XMLLINT
XSLTPROC
COLLATEINDEX
CATALOG
@@ -12219,7 +12220,7 @@ DOCBOOKSTYLE=$pgac_cv_path_stylesheets
if test -n "$DOCBOOKSTYLE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCBOOKSTYLE" >&5
$as_echo "$DOCBOOKSTYLE" >&6; }
- CATALOG=-c $(DOCBOOKSTYLE)/catalog
+ CATALOG="-c ${DOCBOOKSTYLE}/catalog"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -12314,6 +12315,48 @@ fi
test -n "$XSLTPROC" && break
done
+for ac_prog in xmllint
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_XMLLINT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$XMLLINT"; then
+ ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test.
+else
+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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_XMLLINT="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+XMLLINT=$ac_cv_prog_XMLLINT
+if test -n "$XMLLINT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+$as_echo "$XMLLINT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$XMLLINT" && break
+done
+
for ac_prog in osx sgml2xml sx
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
index bd1181f54..759724126 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ PGAC_CHECK_DOCBOOK(4.2)
PGAC_PATH_DOCBOOK_STYLESHEETS
PGAC_PATH_COLLATEINDEX
AC_CHECK_PROGS(XSLTPROC, xsltproc)
+AC_CHECK_PROGS(XMLLINT, xmllint)
AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
AC_CHECK_PROGS(PERL, perl)
AC_CHECK_PROGS(LYNX, lynx)
diff --git a/doc.ja/Makefile.in b/doc.ja/Makefile.in
index 6c835ae28..5e44ee6e6 100644
--- a/doc.ja/Makefile.in
+++ b/doc.ja/Makefile.in
@@ -259,6 +259,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/doc.ja/src/Makefile.in b/doc.ja/src/Makefile.in
index 7ff8b08c1..e78866e8f 100644
--- a/doc.ja/src/Makefile.in
+++ b/doc.ja/src/Makefile.in
@@ -259,6 +259,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/doc.ja/src/sgml/Makefile.am b/doc.ja/src/sgml/Makefile.am
index 9aafeb4ed..25f579611 100644
--- a/doc.ja/src/sgml/Makefile.am
+++ b/doc.ja/src/sgml/Makefile.am
@@ -46,8 +46,8 @@ EXTRA_DIST = $(ALLSGML) html
man distprep-man: man-stamp
-man-stamp: stylesheet-man.xsl postgres.xml
- $(XMLLINT) --noout --valid postgres.xml
+man-stamp: stylesheet-man.xsl pgpool.xml
+ $(XMLLINT) --noout --valid pgpool.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
# The draft target creates HTML output in draft mode, without index (for faster build).
@@ -134,6 +134,7 @@ pgpool-en.xml: $(ALLSGML)
pgpool.xml: $(srcdir)/pgpool.sgml $(ALMOSTALLSGML)
+ SP_CHARSET_FIXED=1 SP_ENCODING=UTF-8 \
$(OSX) -D. -x lower -i include-xslt-index $< >pgpool.xmltmp
$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \
-e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
diff --git a/doc.ja/src/sgml/Makefile.in b/doc.ja/src/sgml/Makefile.in
index bfdb97be5..97fc1afbf 100644
--- a/doc.ja/src/sgml/Makefile.in
+++ b/doc.ja/src/sgml/Makefile.in
@@ -201,6 +201,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@ $(am__append_2)
YACC = @YACC@
@@ -483,8 +484,8 @@ override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
man distprep-man: man-stamp
-man-stamp: stylesheet-man.xsl postgres.xml
- $(XMLLINT) --noout --valid postgres.xml
+man-stamp: stylesheet-man.xsl pgpool.xml
+ $(XMLLINT) --noout --valid pgpool.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
# The draft target creates HTML output in draft mode, without index (for faster build).
@@ -565,6 +566,7 @@ pgpool-en.xml: $(ALLSGML)
rm pgpool-en.xmltmp
pgpool.xml: $(srcdir)/pgpool.sgml $(ALMOSTALLSGML)
+ SP_CHARSET_FIXED=1 SP_ENCODING=UTF-8 \
$(OSX) -D. -x lower -i include-xslt-index $< >pgpool.xmltmp
$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \
-e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
diff --git a/doc.ja/src/sgml/installation.sgml b/doc.ja/src/sgml/installation.sgml
index c0af99df7..9667b6965 100644
--- a/doc.ja/src/sgml/installation.sgml
+++ b/doc.ja/src/sgml/installation.sgml
@@ -263,9 +263,6 @@ GNUの<application>Flex</>および<application>Bison</>は、Gitチェックア
<varlistentry>
<term><option>--with-openssl</option></term>
- <indexterm>
- <primary>OpenSSL</primary>
- </indexterm>
<listitem>
<para>
<!--
diff --git a/doc.ja/src/sgml/start.sgml b/doc.ja/src/sgml/start.sgml
index 8c5988864..dbde48e81 100644
--- a/doc.ja/src/sgml/start.sgml
+++ b/doc.ja/src/sgml/start.sgml
@@ -575,7 +575,7 @@ watchdogの詳細については<xref linkend="tutorial-watchdog">をご覧く
<title><productname>Pgpool-II</productname>のプロセス構造</title>
<mediaobject>
<imageobject>
- <imagedata fileref="process-diagram" format="GIF">
+ <imagedata fileref="process-diagram.gif">
</imageobject>
</mediaobject>
</figure>
diff --git a/doc.ja/src/sgml/version.sgml b/doc.ja/src/sgml/version.sgml
index 48bdc8ccd..2f528b388 100644
--- a/doc.ja/src/sgml/version.sgml
+++ b/doc.ja/src/sgml/version.sgml
@@ -1 +1 @@
-<!ENTITY version "3.6-beta1">
+<!ENTITY version "3.6beta1">
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 56f403cfb..38f6f89b3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -259,6 +259,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/doc/src/Makefile.in b/doc/src/Makefile.in
index a7467007b..e269415eb 100644
--- a/doc/src/Makefile.in
+++ b/doc/src/Makefile.in
@@ -259,6 +259,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/doc/src/sgml/Makefile.am b/doc/src/sgml/Makefile.am
index 4ebfc7542..ae447037d 100644
--- a/doc/src/sgml/Makefile.am
+++ b/doc/src/sgml/Makefile.am
@@ -45,8 +45,8 @@ EXTRA_DIST = $(ALLSGML) html
man distprep-man: man-stamp
-man-stamp: stylesheet-man.xsl postgres.xml
- $(XMLLINT) --noout --valid postgres.xml
+man-stamp: stylesheet-man.xsl pgpool.xml
+ $(XMLLINT) --noout --valid pgpool.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
# The draft target creates HTML output in draft mode, without index (for faster build).
diff --git a/doc/src/sgml/Makefile.in b/doc/src/sgml/Makefile.in
index b9f05c65c..403d50cdb 100644
--- a/doc/src/sgml/Makefile.in
+++ b/doc/src/sgml/Makefile.in
@@ -201,6 +201,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@ $(am__append_2)
YACC = @YACC@
@@ -482,8 +483,8 @@ override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
man distprep-man: man-stamp
-man-stamp: stylesheet-man.xsl postgres.xml
- $(XMLLINT) --noout --valid postgres.xml
+man-stamp: stylesheet-man.xsl pgpool.xml
+ $(XMLLINT) --noout --valid pgpool.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
# The draft target creates HTML output in draft mode, without index (for faster build).
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index ac25e8044..3e992fded 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -181,9 +181,6 @@
<varlistentry>
<term><option>--with-openssl</option></term>
- <indexterm>
- <primary>OpenSSL</primary>
- </indexterm>
<listitem>
<para>
<productname>Pgpool-II</productname> binaries will be built
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index dc25c34f5..69a10bcf2 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -425,7 +425,7 @@ $psql -p $PORT -c "SELECT pg_stop_backup()" postgres
<title>Process architecure of <productname>Pgpool-II</productname></title>
<mediaobject>
<imageobject>
- <imagedata fileref="process-diagram" format="GIF">
+ <imagedata fileref="process-diagram.gif">
</imageobject>
</mediaobject>
</figure>
diff --git a/doc/src/sgml/version.sgml b/doc/src/sgml/version.sgml
index 48bdc8ccd..2f528b388 100644
--- a/doc/src/sgml/version.sgml
+++ b/doc/src/sgml/version.sgml
@@ -1 +1 @@
-<!ENTITY version "3.6-beta1">
+<!ENTITY version "3.6beta1">
diff --git a/m4/docbook.m4 b/m4/docbook.m4
index bf6f1d7ed..74398c144 100644
--- a/m4/docbook.m4
+++ b/m4/docbook.m4
@@ -83,7 +83,7 @@ DOCBOOKSTYLE=$pgac_cv_path_stylesheets
AC_SUBST([DOCBOOKSTYLE])
if test -n "$DOCBOOKSTYLE"; then
AC_MSG_RESULT([$DOCBOOKSTYLE])
- CATALOG=-c $(DOCBOOKSTYLE)/catalog
+ CATALOG="-c ${DOCBOOKSTYLE}/catalog"
else
AC_MSG_RESULT(no)
CATALOG=
diff --git a/src/Makefile.in b/src/Makefile.in
index fb284906e..b2f5a137b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -366,6 +366,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index b435ffc33..261cf606d 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -218,6 +218,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index 78e153cd1..8ee376e16 100644
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -257,6 +257,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
index 0fc7d4e0f..be2b39266 100644
--- a/src/libs/pcp/Makefile.in
+++ b/src/libs/pcp/Makefile.in
@@ -283,6 +283,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/parser/Makefile.in b/src/parser/Makefile.in
index 935411044..869b2112e 100644
--- a/src/parser/Makefile.in
+++ b/src/parser/Makefile.in
@@ -281,6 +281,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index e2bea23c4..701d4459c 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -287,6 +287,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/tools/pcp/Makefile.in b/src/tools/pcp/Makefile.in
index 3e9d06dc0..30fe6a5eb 100644
--- a/src/tools/pcp/Makefile.in
+++ b/src/tools/pcp/Makefile.in
@@ -296,6 +296,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
index d94949a91..fb15a2c2b 100644
--- a/src/tools/pgmd5/Makefile.in
+++ b/src/tools/pgmd5/Makefile.in
@@ -265,6 +265,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
diff --git a/src/watchdog/Makefile.in b/src/watchdog/Makefile.in
index f56289664..72b2e4592 100644
--- a/src/watchdog/Makefile.in
+++ b/src/watchdog/Makefile.in
@@ -256,6 +256,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
STYLE = @STYLE@
VERSION = @VERSION@
+XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
XSLTPROC_HTML_FLAGS = @XSLTPROC_HTML_FLAGS@
YACC = @YACC@
[parent: bafe524601c8]