$NetBSD: patch-ab,v 1.1 2012/07/04 20:15:46 drochner Exp $

--- utils/Makefile.in.orig	2011-01-27 19:32:04.000000000 +0000
+++ utils/Makefile.in
@@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
 	$(top_builddir)/poppler/poppler-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
+am__EXEEXT_1 = pdftoppm$(EXEEXT)
 @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
 pdffonts_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
 	$(am__objects_1)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	$(am__objects_1)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h
 @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
 @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
 pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
+am__DEPENDENCIES_2 = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
 @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
 pdftohtml_LDADD = $(LDADD)
-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
-@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
-@BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
+	$(am__objects_1)
 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
 pdftoppm_LDADD = $(LDADD)
-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
 pdftops_LDADD = $(LDADD)
-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
 	$(am__objects_1)
 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
 pdftotext_LDADD = $(LDADD)
-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
 	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -389,12 +389,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 win32_libs = @win32_libs@
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
-@BUILD_SPLASH_OUTPUT_TRUE@	pdftoppm.cc				\
-@BUILD_SPLASH_OUTPUT_TRUE@	$(common)
+pdftoppm_SOURCES = \
+	pdftoppm.cc				\
+	$(common)
 
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm
-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
+pdftoppm_binary = pdftoppm
+pdftoppm_manpage = pdftoppm.1
 INCLUDES = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/goo			\
@@ -405,9 +405,10 @@ INCLUDES = \
 	$(ABIWORD_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/poppler/libpoppler.la	\
+	$(prefix)/lib/libpoppler.la	\
 	$(UTILS_LIBS)				\
-	$(FONTCONFIG_LIBS)
+	$(FONTCONFIG_LIBS) \
+	$(PTHREAD_STUBLIB)
 
 @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
 @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\