Makefile.am | 6 +----- utils/Makefile.am | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 529db4a94607c1ad909764d26f740c601bbe896f Author: Hib Eris <[email protected]> Date: Mon Sep 29 22:59:15 2014 +0200 Fix build with --disable-utils Since 21b5fd655ce45b90668d1416d21c526ab7eb3ad6, building Poppler fails when configured with '--disable-utils'. Bug #84448 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 _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
