diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:37:29 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:37:29 +0000 |
| commit | ba0d0a588d5bfc00e8076ec0e9e0c9d38154a854 (patch) | |
| tree | 87025fa0819a5b4a12c55d17d59ae0d1dc227e4c /scp2 | |
| parent | 3360d33d73a80c1c114af3e34ad7867e0388e9be (diff) | |
118587: remove libwpd, disable WordPerfect filter, allow built with system libwpd
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2cc7a8c44c86..aebedc2df1bd 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -873,7 +873,7 @@ End #endif -#ifndef DISABLE_LIBWPD +#ifdef SYSTEM_LIBWPD STD_LIB_FILE(gid_File_Lib_Wpft,wpft) #endif diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 9550b58fba2a..ce9b9b725709 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -109,6 +109,10 @@ SCPDEFS+=-DENABLE_CAIRO SCPDEFS+=-DSYSTEM_LIBXML .ENDIF +.IF "$(SYSTEM_LIBWPD)" == "YES" +SCPDEFS+=-DSYSTEM_LIBWPD +.ENDIF + .IF "$(SYSTEM_LIBXSLT)" == "YES" SCPDEFS+=-DSYSTEM_LIBXSLT .ELSE |