summaryrefslogtreecommitdiff
blob: 7aa8ae37cd64de2a74ed9dbdbbceceaba0d6ef77 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
# This patch is taken from cups 1.4.5 and fixes annoying requirement to have poppler around during build-time

--- cups-1.3.11/config-scripts/cups-pdf.m4	2009-03-12 22:34:21.000000000 +0100
+++ cups-1.4.5/config-scripts/cups-pdf.m4	2009-08-08 00:30:30.000000000 +0200
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $"
+dnl "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -13,12 +13,7 @@
 dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
-AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,pdftops,none), default=pdftops ])
-
-if test "x$enable_pdftops" = xno -a "x$with_pdftops" = x; then
-	with_pdftops=no
-fi
+AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])
 
 PDFTOPS=""
 CUPS_PDFTOPS=""
@@ -52,6 +47,12 @@
 	fi
 	;;
 
+	x/*/gs) # Use /path/to/gs without any check:
+	CUPS_GHOSTSCRIPT="$with_pdftops"
+	AC_DEFINE(HAVE_GHOSTSCRIPT)
+	PDFTOPS="pdftops"
+	;;
+
 	xpdftops)
 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
 	if test "x$CUPS_PDFTOPS" != x; then
@@ -62,6 +63,20 @@
 		exit 1
 	fi
 	;;
+
+	x/*/pdftops) # Use /path/to/pdftops without any check:
+	CUPS_PDFTOPS="$with_pdftops"
+	AC_DEFINE(HAVE_PDFTOPS)
+	PDFTOPS="pdftops"
+	;;
+
+	xnone) # Make no pdftops filter if with_pdftops=none:
+	;;
+
+	*) # Invalid with_pdftops value:
+	AC_MSG_ERROR(Invalid with_pdftops value!)
+	exit 1
+	;;
 esac
 
 AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
@@ -69,5 +84,5 @@
 AC_SUBST(PDFTOPS)
 
 dnl
-dnl End of "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $".
+dnl End of "$Id: cups-1.3.11-pdf-m4.patch,v 1.1 2010/12/01 13:03:55 scarabeus Exp $".
 dnl