[master] b3960b3 don't need ps2pdf to generate graphviz pdf output

Nils Goroll nils.goroll at uplex.de
Thu Oct 9 12:06:51 CEST 2014


commit b3960b37a31c790f67b3d84a24de872211d8e89f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Oct 9 12:05:43 2014 +0200

    don't need ps2pdf to generate graphviz pdf output
    
    dot -Tpdf seems to work fine

diff --git a/configure.ac b/configure.ac
index 0691424..f1b5c73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,17 +81,6 @@ AC_ARG_WITH([dot],
    fi])
 AM_CONDITIONAL(HAVE_DOT,[test "x$DOT" != "xno"])
 
-AC_ARG_WITH([ps2pdf],
-  AS_HELP_STRING([--with-ps2pdf=PATH],
-		 [Location of the ps2pdf tool from ghostscript (auto)]),
-  [PS2PDF="$withval"],
-  [AC_CHECK_PROGS(PS2PDF, [ps2pdf], [no])
-   if test "x$PS2PDF" = "xno"; then
-     AC_MSG_WARN(
-       [ps2pdf not found - can't generate graphviz output for documentation.])
-   fi])
-AM_CONDITIONAL(HAVE_PS2PDF,[test "x$PS2PDF" != "xno"])
-
 # Checks for libraries.
 save_LIBS="${LIBS}"
 LIBS=""
diff --git a/doc/graphviz/Makefile.am b/doc/graphviz/Makefile.am
index 51e2b4c..6280eab 100644
--- a/doc/graphviz/Makefile.am
+++ b/doc/graphviz/Makefile.am
@@ -6,7 +6,6 @@
 SIZE	      = 8.4,11.7
 
 if HAVE_DOT
-if HAVE_PS2PDF
 
 PDFS = \
 	cache_http1_fsm.pdf \
@@ -16,10 +15,6 @@ PDFS = \
 pdf: $(PDFS)
 
 endif
-endif
-
-%.ps: %.dot
-	@DOT@ -Tps -Gsize=$(SIZE) $< >$@
 
-%.pdf: %.ps
-	@PS2PDF@ $<
+%.pdf: %.dot
+	@DOT@ -Tpdf -Gsize=$(SIZE) $< >$@



More information about the varnish-commit mailing list