rev |
line source |
shann@25634
|
1 From 1bd330a5240519781fe325c75c29de43ab0ffb29 Mon Sep 17 00:00:00 2001
|
shann@25634
|
2 From: Till Kamppeter <till.kamppeter@canonical.com>
|
shann@25634
|
3 Date: Sat, 24 Sep 2016 10:37:20 +0200
|
shann@25634
|
4 Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
|
shann@25634
|
5 definitions to ppd.h
|
shann@25634
|
6
|
shann@25634
|
7 ---
|
shann@25634
|
8 configure.in | 2 +-
|
shann@25634
|
9 prnt/hpcups/HPCupsFilter.h | 2 ++
|
shann@25634
|
10 prnt/hpijs/hpcupsfax.cpp | 1 +
|
shann@25634
|
11 3 files changed, 4 insertions(+), 1 deletion(-)
|
shann@25634
|
12
|
shann@25634
|
13 diff --git a/configure.in b/configure.in
|
shann@25634
|
14 index bf3902b84..f12eda941 100755
|
shann@25634
|
15 --- a/configure.in
|
shann@25634
|
16 +++ b/configure.in
|
shann@25634
|
17 @@ -591,7 +591,7 @@ fi
|
shann@25634
|
18
|
shann@25634
|
19 if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
|
shann@25634
|
20 AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
|
shann@25634
|
21 - AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
|
shann@25634
|
22 + AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
|
shann@25634
|
23 if test "$libusb01_build" = "yes"; then
|
shann@25634
|
24 AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
|
shann@25634
|
25 AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
|
shann@25634
|
26 diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
|
shann@25634
|
27 index 3d003d5d2..60f858025 100644
|
shann@25634
|
28 --- a/prnt/hpcups/HPCupsFilter.h
|
shann@25634
|
29 +++ b/prnt/hpcups/HPCupsFilter.h
|
shann@25634
|
30 @@ -38,6 +38,8 @@
|
shann@25634
|
31 #include <cups/ppd.h>
|
shann@25634
|
32 #include "dbuscomm.h"
|
shann@25634
|
33
|
shann@25634
|
34 +#include <cups/ppd.h>
|
shann@25634
|
35 +
|
shann@25634
|
36 #define DBITMAPFILEHEADER 14
|
shann@25634
|
37 #define DBITMAPINFOHEADER 40
|
shann@25634
|
38
|
shann@25634
|
39 diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
|
shann@25634
|
40 index 8514775d4..994e50f39 100644
|
shann@25634
|
41 --- a/prnt/hpijs/hpcupsfax.cpp
|
shann@25634
|
42 +++ b/prnt/hpijs/hpcupsfax.cpp
|
shann@25634
|
43 @@ -43,6 +43,7 @@
|
shann@25634
|
44 #include <arpa/inet.h>
|
shann@25634
|
45 #include <math.h>
|
shann@25634
|
46 #include <cups/cups.h>
|
shann@25634
|
47 +#include <cups/ppd.h>
|
shann@25634
|
48 #include <cups/raster.h>
|
shann@25634
|
49 #include <string>
|
shann@25634
|
50 #ifdef FALSE
|