[poppler] configure.ac poppler/poppler-config.h.cmake poppler/poppler-config.h.in

[Albert Astals Cid]

 configure.ac                   |    3 +++
 poppler/poppler-config.h.cmake |    5 +++++
 poppler/poppler-config.h.in    |    5 +++++
 3 files changed, 13 insertions(+)

New commits:
commit 904ae1385e93155a55008977c89aa664b7c8cb9b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Oct 26 14:22:28 2011 +0200

    Expose POPPLER_VERSION in poppler-config.h

diff --git a/configure.ac b/configure.ac
index f64aa49..e4c91ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,9 @@ AC_PROG_INSTALL
 dnl ##### Check for pkgconfig
 PKG_PROG_PKG_CONFIG
 
+dnl ##### Export the version
+AC_DEFINE([POPPLER_VERSION], [poppler_version], [Defines the poppler version])
+
 dnl Enable these unconditionally.
 AC_DEFINE([OPI_SUPPORT], [1], [Generate OPI comments in PS output.])
 AC_DEFINE([MULTITHREADED], [1], [Enable multithreading support.])
diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index ca4de77..4ac31be 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -14,6 +14,11 @@
 // around #undef look odd, but it's to silence warnings about
 // redefining those symbols.
 
+/* Defines the poppler version */
+#ifndef POPPLER_VERSION
+#define POPPLER_VERSION ${POPPLER_VERSION}
+#endif
+
 /* Enable multithreading support. */
 #ifndef MULTITHREADED
 #cmakedefine MULTITHREADED 1
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 732e731..12e42b5 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -14,6 +14,11 @@
 // around #undef look odd, but it's to silence warnings about
 // redefining those symbols.
 
+/* Defines the poppler version. */
+#ifndef POPPLER_VERSION
+#undef POPPLER_VERSION
+#endif
+
 /* Enable multithreading support. */
 #ifndef MULTITHREADED
 #undef MULTITHREADED