Skip to content

Commit 57989e2

Browse files
committed
Eliminate HAVE_PDFTOPPM - that is now a run-time check.
1 parent 1368a23 commit 57989e2

7 files changed

Lines changed: 8 additions & 38 deletions

File tree

config.h.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,6 @@
187187
#undef HAVE_COREGRAPHICS_H
188188

189189

190-
//
191-
// Do we have pdftoppm?
192-
//
193-
194-
#undef HAVE_PDFTOPPM
195-
196-
197190
//
198191
// Do we have the SCDynamicStoreCopyComputerName function?
199192
//

configure

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4312,14 +4312,7 @@ fi
43124312

43134313

43144314

4315-
if test "x$PDFTOPPM" != x
4316-
then :
4317-
4318-
4319-
printf "%s\n" "#define HAVE_PDFTOPPM 1" >>confdefs.h
4320-
4321-
4322-
elif test "x$with_pdfrip" = xpdftoppm
4315+
if test "x$PDFTOPPM" == x -a "x$with_pdfrip" = xpdftoppm
43234316
then :
43244317

43254318
as_fn_error $? "Unable to find pdftoppm program." "$LINENO" 5

configure.ac

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ AS_CASE(["$use_pdfrip"], [coregraphics], [
155155
], [pdftoppm], [
156156
AC_PATH_PROG([PDFTOPPM], [pdftoppm])
157157
158-
AS_IF([test "x$PDFTOPPM" != x], [
159-
AC_DEFINE([HAVE_PDFTOPPM], [1], [Do we have pdftoppm?])
160-
], [test "x$with_pdfrip" = xpdftoppm], [
158+
AS_IF([test "x$PDFTOPPM" == x -a "x$with_pdfrip" = xpdftoppm], [
161159
AC_MSG_ERROR([Unable to find pdftoppm program.])
162160
])
163161
], [none], [

vcnet/README.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
README - CUPS on Windows - 2022-02-16
2-
=====================================
1+
README - CUPS on Windows
2+
========================
33

44
This directory contains Visual Studio 2019+ project and solution files for
5-
building the CUPS library and ippeveprinter, ippfind, ipptool, testfile, and
6-
testhttp programs on Windows.
5+
building the CUPS library and ippeveprinter, ippfind, ipptool, ipptransform,
6+
testfile, and testhttp programs on Windows.

vcnet/config.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,6 @@ typedef unsigned long useconds_t;
267267
// #undef HAVE_COREGRAPHICS_H
268268

269269

270-
//
271-
// Do we have pdftoppm?
272-
//
273-
274-
#define HAVE_PDFTOPPM 1
275-
276-
277270
//
278271
// Do we have the SCDynamicStoreCopyComputerName function?
279272
//

xcode/README.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
README - CUPS on macOS/iOS - 2016-08-08
2-
---------------------------------------
1+
README - CUPS on macOS/iOS
2+
==========================
33

44
This directory contains an Xcode project for building CUPS for macOS and the
55
CUPS library for iOS.

xcode/config.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,6 @@
187187
#define HAVE_COREGRAPHICS_H 1
188188

189189

190-
//
191-
// Do we have pdftoppm?
192-
//
193-
194-
// #undef HAVE_PDFTOPPM
195-
196-
197190
//
198191
// Do we have the SCDynamicStoreCopyComputerName function?
199192
//

0 commit comments

Comments
 (0)