merged trunk

(bzr r14059.1.15)

6 files changed, 236 insertions, 30 deletions

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 5f76e01e9..905465448 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -9,6 +9,9 @@ include(CheckStructHasMember)
 # usage: CHECK_FUNCTION_EXISTS (<function name> <RESULT_VARIABLE> )
 # usage: CHECK_STRUCT_HAS_MEMBER (<struct> <member> <header> <RESULT_VARIABLE>)
 
+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS})
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS})
+
 CHECK_INCLUDE_FILES(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)
 CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF)
 CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR)
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 321f0982c..e96609d34 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -122,6 +122,10 @@ if(ENABLE_POPPLER)
 		   POPPLER_VERSION VERSION_EQUAL   "0.26.0")
 			set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
 		endif()
+		if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
+		   POPPLER_VERSION VERSION_EQUAL   "0.29.0")
+			set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+		endif()
 		if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR
 		   POPPLER_VERSION VERSION_EQUAL   "0.15.1")
 			set(POPPLER_NEW_GFXPATCH ON)
@@ -145,8 +149,9 @@ add_definitions(${POPPLER_DEFINITIONS})
 if(WITH_LIBWPG)
 	find_package(LibWPG)
 	if(LIBWPG_FOUND)
-		set(WITH_LIBWPG-0.1 ${LIBWPG-0.1_FOUND})
-		set(WITH_LIBWPG-0.2 ${LIBWPG-0.2_FOUND})
+		set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND})
+		set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND})
+		set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND})
 		list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS})
 		list(APPEND INKSCAPE_LIBS     ${LIBWPG_LIBRARIES})
 		add_definitions(${LIBWPG_DEFINITIONS})
@@ -155,6 +160,32 @@ if(WITH_LIBWPG)
 	endif()
 endif()
 
+if(WITH_LIBVISIO)
+	find_package(LibVisio)
+	if(LIBVISIO_FOUND)
+		set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND})
+		set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND})
+		list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS})
+		list(APPEND INKSCAPE_LIBS     ${LIBVISIO_LIBRARIES})
+		add_definitions(${LIBVISIO_DEFINITIONS})
+	else()
+		set(WITH_LIBVISIO OFF)
+	endif()
+endif()
+
+if(WITH_LIBCDR)
+	find_package(LibCDR)
+	if(LIBCDR_FOUND)
+		set(WITH_LIBCDR00 ${LIBVISIO-0.0_FOUND})
+		set(WITH_LIBCDR01 ${LIBVISIO-0.1_FOUND})
+		list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS})
+		list(APPEND INKSCAPE_LIBS     ${LIBCDR_LIBRARIES})
+		add_definitions(${LIBCDR_DEFINITIONS})
+	else()
+		set(WITH_LIBCDR OFF)
+	endif()
+endif()
+
 FIND_PACKAGE(JPEG REQUIRED)
 #IF(JPEG_FOUND)
   #INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
@@ -296,6 +327,12 @@ find_package(ImageMagick COMPONENTS MagickCore Magick++)
 if(ImageMagick_FOUND)
 	list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_MagickCore_INCLUDE_DIR})
 	list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY})
+	set(WITH_IMAGE_MAGICK ON)  # enable 'Extensions > Raster'
+	# TODO: Cmake's ImageMagick module misses required defines for newer
+	# versions of ImageMagick. See also:
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776832
+	#add_definitions(-DMAGICKCORE_HDRI_ENABLE=0)  # FIXME (version check?)
+	#add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16)  # FIXME (version check?)
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake)
@@ -306,7 +343,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake)
 include_directories(${INKSCAPE_INCS})
 include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
 
+include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
+
 unset(INKSCAPE_INCS)
 unset(INKSCAPE_INCS_SYS)
-
-include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
diff --git a/CMakeScripts/Modules/FindLibCDR.cmake b/CMakeScripts/Modules/FindLibCDR.cmake
new file mode 100644
index 000000000..57a04807e
--- /dev/null
+++ b/CMakeScripts/Modules/FindLibCDR.cmake
@@ -0,0 +1,56 @@
+# - Try to find LibCDR
+# Once done this will define
+#
+#  LIBCDR_FOUND - system has LibCDR
+#  LIBCDR_INCLUDE_DIRS - the LibCDR include directory
+#  LIBCDR_LIBRARIES - Link these to use LibCDR
+#  LIBCDR_DEFINITIONS - Compiler switches required for using LibCDR
+#
+#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
+#  Copyright (c) 2015 su_v <suv-sf@users.sf.net>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(${CMAKE_CURRENT_LIST_DIR}/../HelperMacros.cmake)
+
+if (LIBCDR_LIBRARIES AND LIBCDR_INCLUDE_DIRS)
+	# in cache already
+	set(LIBCDR_FOUND TRUE)
+else (LIBCDR_LIBRARIES AND LIBCDR_INCLUDE_DIRS)
+	# use pkg-config to get the directories and then use these values
+	# in the FIND_PATH() and FIND_LIBRARY() calls
+	find_package(PkgConfig)
+	if (PKG_CONFIG_FOUND)
+		INKSCAPE_PKG_CONFIG_FIND(LIBCDR-0.1 libcdr-0.1 0 libcdr/libcdr.h libcdr-0.1 cdr-0.1)
+		if (LIBCDR-0.1_FOUND)
+			find_package(LibRevenge)
+			if (LIBREVENGE_FOUND)
+				list(APPEND LIBCDR_INCLUDE_DIRS ${LIBCDR-0.1_INCLUDE_DIRS})
+				list(APPEND LIBCDR_LIBRARIES    ${LIBCDR-0.1_LIBRARIES})
+				list(APPEND LIBCDR_INCLUDE_DIRS ${LIBREVENGE_INCLUDE_DIRS})
+				list(APPEND LIBCDR_LIBRARIES    ${LIBREVENGE_LIBRARIES})
+				set(LIBCDR01_FOUND TRUE)
+			endif (LIBREVENGE_FOUND)
+		else()
+			INKSCAPE_PKG_CONFIG_FIND(LIBCDR-0.0 libcdr-0.0 0 libcdr/libcdr.h libcdr-0.0 cdr-0.0)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.9 libwpd-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-0.9)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-STREAM-0.9 libwpd-stream-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-stream-0.9)
+			if (LIBCDR-0.0_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+				list(APPEND LIBCDR_INCLUDE_DIRS ${LIBCDR-0.0_INCLUDE_DIRS})
+				list(APPEND LIBCDR_LIBRARIES    ${LIBCDR-0.0_LIBRARIES})
+				list(APPEND LIBCDR_INCLUDE_DIRS ${LIBWPD-0.9_INCLUDE_DIRS})
+				list(APPEND LIBCDR_LIBRARIES    ${LIBWPD-0.9_LIBRARIES})
+				list(APPEND LIBCDR_INCLUDE_DIRS ${LIBWPD-STREAM-0.9_INCLUDE_DIRS})
+				list(APPEND LIBCDR_LIBRARIES    ${LIBWPD-STREAM-0.9_LIBRARIES})
+				set(LIBCDR00_FOUND TRUE)
+			endif (LIBCDR-0.0_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+		endif (LIBCDR-0.1_FOUND)
+		if (LIBCDR-0.1_FOUND OR LIBCDR-0.0_FOUND)
+			set(LIBCDR_FOUND TRUE)
+		endif (LIBCDR-0.1_FOUND OR LIBCDR-0.0_FOUND)
+	endif (PKG_CONFIG_FOUND)
+endif (LIBCDR_LIBRARIES AND LIBCDR_INCLUDE_DIRS)
+
diff --git a/CMakeScripts/Modules/FindLibRevenge.cmake b/CMakeScripts/Modules/FindLibRevenge.cmake
new file mode 100644
index 000000000..90d1ecf06
--- /dev/null
+++ b/CMakeScripts/Modules/FindLibRevenge.cmake
@@ -0,0 +1,41 @@
+# - Try to find LibRevenge
+# Once done this will define
+#
+#  LIBREVENGE_FOUND - system has LibRevenge
+#  LIBREVENGE_INCLUDE_DIRS - the LibRevenge include directory
+#  LIBREVENGE_LIBRARIES - Link these to use LibRevenge
+#  LIBREVENGE_DEFINITIONS - Compiler switches required for using LibRevenge
+#
+#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
+#  Copyright (c) 2015 su_v <suv-sf@users.sf.net>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(${CMAKE_CURRENT_LIST_DIR}/../HelperMacros.cmake)
+
+if (LIBREVENGE_LIBRARIES AND LIBREVENGE_INCLUDE_DIRS)
+	# in cache already
+	set(LIBREVENGE_FOUND TRUE)
+else (LIBREVENGE_LIBRARIES AND LIBREVENGE_INCLUDE_DIRS)
+	# use pkg-config to get the directories and then use these values
+	# in the FIND_PATH() and FIND_LIBRARY() calls
+	find_package(PkgConfig)
+	if (PKG_CONFIG_FOUND)
+		INKSCAPE_PKG_CONFIG_FIND(LIBREVENGE-0.0 librevenge-0.0 0 librevenge/librevenge.h librevenge-0.0 revenge-0.0)
+		INKSCAPE_PKG_CONFIG_FIND(LIBREVENGE-STREAM-0.0 librevenge-stream-0.0 0 librevenge-0.0/librevenge-stream/librevenge-stream.h librevenge-stream-0.0 revenge-stream-0.0)
+		if (LIBREVENGE-0.0_FOUND AND LIBREVENGE-STREAM-0.0_FOUND)
+			list(APPEND LIBREVENGE_INCLUDE_DIRS ${LIBREVENGE-0.0_INCLUDE_DIRS})
+			list(APPEND LIBREVENGE_LIBRARIES    ${LIBREVENGE-0.0_LIBRARIES})
+			list(APPEND LIBREVENGE_INCLUDE_DIRS ${LIBREVENGE-STREAM-0.0_INCLUDE_DIRS})
+			list(APPEND LIBREVENGE_LIBRARIES    ${LIBREVENGE-STREAM-0.0_LIBRARIES})
+			set(LIBREVENGE00_FOUND TRUE)
+		endif (LIBREVENGE-0.0_FOUND AND LIBREVENGE-STREAM-0.0_FOUND)
+		if (LIBREVENGE-0.0_FOUND)
+			set(LIBREVENGE_FOUND TRUE)
+		endif (LIBREVENGE-0.0_FOUND)
+	endif (PKG_CONFIG_FOUND)
+endif (LIBREVENGE_LIBRARIES AND LIBREVENGE_INCLUDE_DIRS)
+
diff --git a/CMakeScripts/Modules/FindLibVisio.cmake b/CMakeScripts/Modules/FindLibVisio.cmake
new file mode 100644
index 000000000..a4e88aeaa
--- /dev/null
+++ b/CMakeScripts/Modules/FindLibVisio.cmake
@@ -0,0 +1,56 @@
+# - Try to find LibVisio
+# Once done this will define
+#
+#  LIBVISIO_FOUND - system has LibVisio
+#  LIBVISIO_INCLUDE_DIRS - the LibVisio include directory
+#  LIBVISIO_LIBRARIES - Link these to use LibVisio
+#  LIBVISIO_DEFINITIONS - Compiler switches required for using LibVisio
+#
+#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
+#  Copyright (c) 2015 su_v <suv-sf@users.sf.net>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(${CMAKE_CURRENT_LIST_DIR}/../HelperMacros.cmake)
+
+if (LIBVISIO_LIBRARIES AND LIBVISIO_INCLUDE_DIRS)
+	# in cache already
+	set(LIBVISIO_FOUND TRUE)
+else (LIBVISIO_LIBRARIES AND LIBVISIO_INCLUDE_DIRS)
+	# use pkg-config to get the directories and then use these values
+	# in the FIND_PATH() and FIND_LIBRARY() calls
+	find_package(PkgConfig)
+	if (PKG_CONFIG_FOUND)
+		INKSCAPE_PKG_CONFIG_FIND(LIBVISIO-0.1 libvisio-0.1 0 libvisio/libvisio.h libvisio-0.1 visio-0.1)
+		if (LIBVISIO-0.1_FOUND)
+			find_package(LibRevenge)
+			if (LIBREVENGE_FOUND)
+				list(APPEND LIBVISIO_INCLUDE_DIRS ${LIBVISIO-0.1_INCLUDE_DIRS})
+				list(APPEND LIBVISIO_LIBRARIES    ${LIBVISIO-0.1_LIBRARIES})
+				list(APPEND LIBVISIO_INCLUDE_DIRS ${LIBREVENGE_INCLUDE_DIRS})
+				list(APPEND LIBVISIO_LIBRARIES    ${LIBREVENGE_LIBRARIES})
+				set(LIBVISIO01_FOUND TRUE)
+			endif (LIBREVENGE_FOUND)
+		else()
+			INKSCAPE_PKG_CONFIG_FIND(LIBVISIO-0.0 libvisio-0.0 0 libvisio/libvisio.h libvisio-0.0 visio-0.0)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.9 libwpd-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-0.9)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-STREAM-0.9 libwpd-stream-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-stream-0.9)
+			if (LIBVISIO-0.0_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+				list(APPEND LIBVISIO_INCLUDE_DIRS ${LIBVISIO-0.0_INCLUDE_DIRS})
+				list(APPEND LIBVISIO_LIBRARIES    ${LIBVISIO-0.0_LIBRARIES})
+				list(APPEND LIBVISIO_INCLUDE_DIRS ${LIBWPD-0.9_INCLUDE_DIRS})
+				list(APPEND LIBVISIO_LIBRARIES    ${LIBWPD-0.9_LIBRARIES})
+				list(APPEND LIBVISIO_INCLUDE_DIRS ${LIBWPD-STREAM-0.9_INCLUDE_DIRS})
+				list(APPEND LIBVISIO_LIBRARIES    ${LIBWPD-STREAM-0.9_LIBRARIES})
+				set(LIBVISIO00_FOUND TRUE)
+			endif (LIBVISIO-0.0_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+		endif (LIBVISIO-0.1_FOUND)
+		if (LIBVISIO-0.1_FOUND OR LIBVISIO-0.0_FOUND)
+			set(LIBVISIO_FOUND TRUE)
+		endif (LIBVISIO-0.1_FOUND OR LIBVISIO-0.0_FOUND)
+	endif (PKG_CONFIG_FOUND)
+endif (LIBVISIO_LIBRARIES AND LIBVISIO_INCLUDE_DIRS)
+
diff --git a/CMakeScripts/Modules/FindLibWPG.cmake b/CMakeScripts/Modules/FindLibWPG.cmake
index 136267070..0eaf8f102 100644
--- a/CMakeScripts/Modules/FindLibWPG.cmake
+++ b/CMakeScripts/Modules/FindLibWPG.cmake
@@ -23,32 +23,45 @@ else (LIBWPG_LIBRARIES AND LIBWPG_INCLUDE_DIRS)
 	# in the FIND_PATH() and FIND_LIBRARY() calls
 	find_package(PkgConfig)
 	if (PKG_CONFIG_FOUND)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.1 libwpg-0.1 0 libwpg/libwpg.h libwpg-0.1 wpg-0.1)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPG-STREAM-0.1 libwpg-stream-0.1 0 libwpg/libwpg.h libwpg-0.1 wpg-stream-0.1)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.8 libwpd-0.8 0 libwpd/libwpd.h libwpd-0.8 wpd-0.8)
-		if (LIBWPG-0.1_FOUND AND LIBWPG-STREAM-0.1_FOUND AND LIBWPD-0.8_FOUND)
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.1_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-0.1_LIBRARIES})
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-STREAM-0.1_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-STREAM-0.1_LIBRARIES})
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-0.8_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-0.8_LIBRARIES})
-			set(LIBWPG01_FOUND TRUE)
-		endif (LIBWPG-0.1_FOUND AND LIBWPG-STREAM-0.1_FOUND AND LIBWPD-0.8_FOUND)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.2 libwpg-0.2 0 libwpg/libwpg.h libwpg-0.2 wpg-0.2)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.9 libwpd-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-0.9)
-		INKSCAPE_PKG_CONFIG_FIND(LIBWPD-STREAM-0.9 libwpd-stream-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-stream-0.9)
-		if (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.2_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-0.2_LIBRARIES})
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-0.9_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-0.9_LIBRARIES})
-			list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-STREAM-0.9_INCLUDE_DIRS})
-			list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-STREAM-0.9_LIBRARIES})
-			set(LIBWPG02_FOUND TRUE)
-		endif (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
-		if (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND)
+		INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.3 libwpg-0.3 0 libwpg/libwpg.h libwpg-0.3 wpg-0.3)
+		if (LIBWPG-0.3_FOUND)
+			find_package(LibRevenge)
+			if (LIBREVENGE_FOUND)
+				list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.3_INCLUDE_DIRS})
+				list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-0.3_LIBRARIES})
+				list(APPEND LIBWPG_INCLUDE_DIRS ${LIBREVENGE-0.0_INCLUDE_DIRS})
+				list(APPEND LIBWPG_LIBRARIES    ${LIBREVENGE-0.0_LIBRARIES})
+				set(LIBWPG03_FOUND TRUE)
+			endif (LIBREVENGE_FOUND)
+		else()
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.2 libwpg-0.2 0 libwpg/libwpg.h libwpg-0.2 wpg-0.2)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.9 libwpd-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-0.9)
+			INKSCAPE_PKG_CONFIG_FIND(LIBWPD-STREAM-0.9 libwpd-stream-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-stream-0.9)
+			if (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+				list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.2_INCLUDE_DIRS})
+				list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-0.2_LIBRARIES})
+				list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-0.9_INCLUDE_DIRS})
+				list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-0.9_LIBRARIES})
+				list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-STREAM-0.9_INCLUDE_DIRS})
+				list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-STREAM-0.9_LIBRARIES})
+				set(LIBWPG02_FOUND TRUE)
+			else()
+				INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.1 libwpg-0.1 0 libwpg/libwpg.h libwpg-0.1 wpg-0.1)
+				INKSCAPE_PKG_CONFIG_FIND(LIBWPG-STREAM-0.1 libwpg-stream-0.1 0 libwpg/libwpg.h libwpg-0.1 wpg-stream-0.1)
+				INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.8 libwpd-0.8 0 libwpd/libwpd.h libwpd-0.8 wpd-0.8)
+				if (LIBWPG-0.1_FOUND AND LIBWPG-STREAM-0.1_FOUND AND LIBWPD-0.8_FOUND)
+					list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.1_INCLUDE_DIRS})
+					list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-0.1_LIBRARIES})
+					list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-STREAM-0.1_INCLUDE_DIRS})
+					list(APPEND LIBWPG_LIBRARIES    ${LIBWPG-STREAM-0.1_LIBRARIES})
+					list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-0.8_INCLUDE_DIRS})
+					list(APPEND LIBWPG_LIBRARIES    ${LIBWPD-0.8_LIBRARIES})
+					set(LIBWPG01_FOUND TRUE)
+				endif (LIBWPG-0.1_FOUND AND LIBWPG-STREAM-0.1_FOUND AND LIBWPD-0.8_FOUND)
+			endif (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND)
+		endif (LIBWPG-0.3_FOUND)
+		if (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND OR LIBWPG-0.3_FOUND)
 			set(LIBWPG_FOUND TRUE)
-		endif (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND)
+		endif (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND OR LIBWPG-0.3_FOUND)
 	endif (PKG_CONFIG_FOUND)
 endif (LIBWPG_LIBRARIES AND LIBWPG_INCLUDE_DIRS)