From 3a86fbe8f7ffd5782c1cb736192d4ee5a5dc6d7f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sat, 11 Jun 2011 02:48:13 -0700 Subject: Update to win32 build defines for libwpg issue. (bzr r10269) --- build-lx.xml | 3 +++ build.xml | 3 +++ src/extension/internal/wpg-input.cpp | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/build-lx.xml b/build-lx.xml index 4f81783ef..307bbb2d8 100644 --- a/build-lx.xml +++ b/build-lx.xml @@ -173,6 +173,9 @@ /* Allow reading WordPerfect? */ #define WITH_LIBWPG 1 + /* Default to libwpg 0.1.x */ + #define WITH_LIBWPG01 1 + #endif /* _CONFIG_H_ */ diff --git a/build.xml b/build.xml index bc0676a22..76d478ca5 100755 --- a/build.xml +++ b/build.xml @@ -187,6 +187,9 @@ /* Allow reading WordPerfect? */ #define WITH_LIBWPG 1 + /* Default to libwpg 0.1.x */ + #define WITH_LIBWPG01 1 + /* Do we support SVG Fonts? */ #define ENABLE_SVG_FONTS 1 diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index b6425b380..3cd5044f7 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -49,6 +49,11 @@ #include "extension/input.h" #include "document.h" +// Take a guess and fallback to 0.1.x if no configure has run +#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02) +#define WITH_LIBWPG01 1 +#endif + #include "libwpg/libwpg.h" #if WITH_LIBWPG01 #include "libwpg/WPGStreamImplementation.h" -- cgit v1.2.3