Use pandoc to build pg_arman documentation

vbwagner · vbwagner · commit 63140c6c1c34 · 2016-06-16T10:45:25.000+03:00
diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -109,7 +109,7 @@ distdir:
 	$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
 	cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
 	$(MAKE) -C $(distdir) distclean
-	$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
+	cd $(distdir)/contrib/pg_arman/doc; $(PANDOC) -o pg_arman.1 -t man -s pg_arman.md 
 	rm -f $(distdir)/README.git
 
 distcheck: dist
diff --git a/configure b/configure
@@ -631,6 +631,7 @@ PGPRO_VERSION
 vpath_build
 PG_VERSION_NUM
 PROVE
+PANDOC
 OSX
 XSLTPROC
 XMLLINT
@@ -17257,6 +17258,47 @@ fi
   test -n "$OSX" && break
 done
 
+for ac_prog in pandoc
+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_PANDOC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PANDOC"; then
+  ac_cv_prog_PANDOC="$PANDOC" # 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_PANDOC="$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
+PANDOC=$ac_cv_prog_PANDOC
+if test -n "$PANDOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
+$as_echo "$PANDOC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PANDOC" && break
+done
 
 #
 # Check for test tools
diff --git a/configure.in b/configure.in
@@ -2134,7 +2134,7 @@ AC_CHECK_PROGS(DBTOEPUB, dbtoepub)
 AC_CHECK_PROGS(XMLLINT, xmllint)
 AC_CHECK_PROGS(XSLTPROC, xsltproc)
 AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
-
+AC_CHECK_PROGS(PANDOC, pandoc)
 #
 # Check for test tools
 #
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -403,6 +403,7 @@ NSGMLS			= @NSGMLS@
 OSX				= @OSX@
 XMLLINT			= @XMLLINT@
 XSLTPROC		= @XSLTPROC@
+PANDOC			= @PANDOC@
 
 # Code coverage
 

Original file line number	Diff line number	Diff line change
`@@ -2134,7 +2134,7 @@ AC_CHECK_PROGS(DBTOEPUB, dbtoepub)`
`2134`	`2134`	`AC_CHECK_PROGS(XMLLINT, xmllint)`
`2135`	`2135`	`AC_CHECK_PROGS(XSLTPROC, xsltproc)`
`2136`	`2136`	`AC_CHECK_PROGS(OSX, [osx sgml2xml sx])`
`2137`		`-`
	`2137`	`+AC_CHECK_PROGS(PANDOC, pandoc)`
`2138`	`2138`	`#`
`2139`	`2139`	`# Check for test tools`
`2140`	`2140`	`#`