Attachment 107039 Details for Bug 84448 – Fix build with --disable-utils

[patch] Fix build with --disable-utils

Fix-build-with---disable-utils.patch (text/plain), 1.39 KB, created by Hib Eris on 2014-09-29 05:14:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2014-09-29 05:14:35 UTC

Size: 1.39 KB

patch

obsolete

>From bcae0b591ef03592cd7db745f26abcb5b69eaebc Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Mon, 29 Sep 2014 07:09:58 +0200
>Subject: [PATCH] Fix build with --disable-utils
>
>Since 21b5fd655ce45b90668d1416d21c526ab7eb3ad6, building Poppler fails when configured
>with '--disable-utils'.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=84448
>---
> Makefile.am       | 6 +-----
> utils/Makefile.am | 4 ++++
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index e7e5bac..691512f 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -31,11 +31,7 @@ cpp_subdir = cpp
> cpp_pc_file = poppler-cpp.pc
> endif
> 
>-if BUILD_UTILS
>-utils_subdir = utils
>-endif
>-
>-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
>+SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
> 
> EXTRA_DIST =					\
> 	README-XPDF				\
>diff --git a/utils/Makefile.am b/utils/Makefile.am
>index dede2f6..bc0a549 100644
>--- a/utils/Makefile.am
>+++ b/utils/Makefile.am
>@@ -12,6 +12,8 @@ LDADD =						\
> 	$(top_builddir)/poppler/libpoppler.la	\
> 	$(UTILS_LIBS)
> 
>+if BUILD_UTILS
>+
> bin_PROGRAMS =					\
> 	pdfdetach				\
> 	pdffonts				\
>@@ -50,6 +52,8 @@ if BUILD_CAIRO_OUTPUT
> dist_man1_MANS += pdftocairo.1
> endif
> 
>+endif # if BUILD_UTILS
>+
> pdfdetach_SOURCES =				\
> 	pdfdetach.cc
> 
>-- 
>1.9.1

Actions: View | Splinter Review

Attachments on bug 84448: 107039

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.