[poppler] poppler: ChangeLog, 1.259, 1.260 Makefile.am, 1.4, 1.5 configure.ac, 1.39, 1.40

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv21377

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
2005-12-12  Kristian Høgsberg  <krh at redhat.com>

	* Makefile.am:
	* configure.ac:
	* goo/GooVector.h:
	* utils/HtmlFonts.cc:
	* utils/HtmlFonts.h:
	* utils/HtmlLinks.cc:
	* utils/HtmlLinks.h:
	* utils/HtmlOutputDev.cc:
	* utils/HtmlOutputDev.h:
	* utils/ImageOutputDev.cc:
	* utils/ImageOutputDev.h:
	* utils/Makefile.am:
	* utils/parseargs.c:
	* utils/parseargs.h:
	* utils/pdffonts.1:
	* utils/pdffonts.cc:
	* utils/pdfimages.1:
	* utils/pdfimages.cc:
	* utils/pdfinfo.1:
	* utils/pdfinfo.cc:
	* utils/pdftohtml.1:
	* utils/pdftohtml.cc:
	* utils/pdftoppm.1:
	* utils/pdftoppm.cc:
	* utils/pdftops.1:
	* utils/pdftops.cc:
	* utils/pdftotext.1:
	* utils/pdftotext.cc: Add command line utilities from xpdf.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- ChangeLog	10 Dec 2005 10:52:15 -0000	1.259
+++ ChangeLog	12 Dec 2005 20:15:11 -0000	1.260
@@ -1,3 +1,34 @@
+2005-12-12  Kristian Høgsberg  <krh at redhat.com>
+
+	* Makefile.am:
+	* configure.ac:
+	* goo/GooVector.h:
+	* utils/HtmlFonts.cc:
+	* utils/HtmlFonts.h:
+	* utils/HtmlLinks.cc:
+	* utils/HtmlLinks.h:
+	* utils/HtmlOutputDev.cc:
+	* utils/HtmlOutputDev.h:
+	* utils/ImageOutputDev.cc:
+	* utils/ImageOutputDev.h:
+	* utils/Makefile.am:
+	* utils/parseargs.c:
+	* utils/parseargs.h:
+	* utils/pdffonts.1:
+	* utils/pdffonts.cc:
+	* utils/pdfimages.1:
+	* utils/pdfimages.cc:
+	* utils/pdfinfo.1:
+	* utils/pdfinfo.cc:
+	* utils/pdftohtml.1:
+	* utils/pdftohtml.cc:
+	* utils/pdftoppm.1:
+	* utils/pdftoppm.cc:
+	* utils/pdftops.1:
+	* utils/pdftops.cc:
+	* utils/pdftotext.1:
+	* utils/pdftotext.cc: Add command line utilities from xpdf.
+
 2005-12-10  Albert Astals Cid  <aacid at kde.org>
 
 	* qt4/src/poppler-page.cc:

Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	28 Jun 2005 10:00:09 -0000	1.4
+++ Makefile.am	12 Dec 2005 20:15:11 -0000	1.5
@@ -22,7 +22,11 @@
 qt4_pc_file = poppler-qt4.pc
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
+if BUILD_UTILS
+utils_subdir = utils
+endif
+
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
 
 EXTRA_DIST =					\
 	README-XPDF				\

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.ac	9 Dec 2005 19:40:40 -0000	1.39
+++ configure.ac	12 Dec 2005 20:15:11 -0000	1.40
@@ -479,6 +479,13 @@
 AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes)
 
 
+AC_ARG_ENABLE(utils,
+              AC_HELP_STRING([--disable-utils],
+	                     [Don't compile poppler command line utils.]),
+              enable_utils=$enableval,
+              enable_utils="yes")
+AM_CONDITIONAL(BUILD_UTILS, test x$enable_utils = xyes)
+
 AC_ARG_ENABLE(compile-warnings,
               AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/kde@:>@]
                              [Turn on compiler warnings.]),,
@@ -505,6 +512,7 @@
 fofi/Makefile
 splash/Makefile
 poppler/Makefile
+utils/Makefile
 glib/Makefile
 test/Makefile
 qt/Makefile
@@ -521,11 +529,12 @@
 
 echo ""
 echo "Building poppler with support for:"
-echo "  splash output: $enable_splash_output"
-echo "  cairo output:  $enable_cairo_output"
-echo "  qt wrapper:    $enable_poppler_qt"
-echo "  qt4 wrapper:   $enable_poppler_qt4"
-echo "  qt4 unittests: $enable_poppler_qt4testlib"
-echo "  glib wrapper:  $enable_poppler_glib"
-echo "  use libjpeg:   $enable_libjpeg"
-echo "  use zlib:      $enable_zlib"
+echo "  splash output:      $enable_splash_output"
+echo "  cairo output:       $enable_cairo_output"
+echo "  qt wrapper:         $enable_poppler_qt"
+echo "  qt4 wrapper:        $enable_poppler_qt4"
+echo "  qt4 unittests:      $enable_poppler_qt4testlib"
+echo "  glib wrapper:       $enable_poppler_glib"
+echo "  use libjpeg:        $enable_libjpeg"
+echo "  use zlib:           $enable_zlib"
+echo "  command line utils: $enable_poppler_glib"