Merge remote branch 'origin/cpp-frontend'

* origin/cpp-frontend: (34 commits)
  [cpp/tests] poppler-dump: show a string for the font type
  [cpp/tests] poppler-dump: show the orientation of the pages
  [cpp/tests] poppler-dump: a bit less output in permissions lines
  [cpp/tests] poppler-dump: add --show-all to show all the information
  [cpp] use iconv for the utf8 <-> utf16 conversions
  [cpp] add the build system stuff for iconv, mandatory for cpp
  [cpp] fixup unicode GooString <-> ustring conversions
  [cpp] fix installation of poppler-version.h with autotools and builddir != srcdir
  simplify
  [cpp/tests] add a simple poppler-dump test
  [cpp] use the correct index (instead of an uninitialized variable)
  [cpp] properly delete the children of a toc item
  [cpp] actually implement toc::root()
  [cpp] fix the reference to the vector data
  [cpp] fix the reference to the vector data
  [cpp] add destructor for 'rectangle'
  [cpp] add out stream operators for rect and rectf
  [cpp] add namespace to namespace functiond to link properly
  [cpp] add default empty parameters for the passwords of the document loading functions
  [cpp] add "human friendly" output representation for byte_array
  ...

Conflicts:
	config.h.cmake

1 files changed, 6 insertions, 0 deletions

diff --git a/config.h.cmake b/config.h.cmake
index 0097d8d5..ec120455 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -49,6 +49,9 @@
 /* Defines if gmtime_r is available on your system */
 #cmakedefine HAVE_GMTIME_R 1
 
+/* Define if you have the iconv() function and it works. */
+#cmakedefine HAVE_ICONV 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 
@@ -120,6 +123,9 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 #cmakedefine HAVE_ZLIB_H 1
 
+/* Define as const if the declaration of iconv() needs const. */
+#cmakedefine ICONV_CONST 1
+
 /* Enable multithreading support. */
 #cmakedefine MULTITHREADED 1