From 79e5ee5f6949f4b8645ef32dba61705d02473c60 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 29 Nov 2012 11:27:45 +0100
Subject: Isolate PDF Import so it can be made optionally installable

...which can be attractive for installation sets that use --with-system-poppler
but do not want the LO core package to depend on a poppler package.  See the
comment at the top of scp2/source/ooo/module_pdfimport.scp for details.

The build-time --disable-pdfimport configure switch is gone, PDF Import is built
unconditionally for all platforms but Android and iOS now.  (The
ENABLE_PDFIMPORT variable now uses TRUE/FALSE rather than YES/NO, to increase
consistency across those variables.)

Change-Id: I6509d0b2e770b276cd54540408fb1ec5a7dda058
---
 distro-configs/LibreOfficeAndroid.conf    | 1 -
 distro-configs/LibreOfficeAndroidX86.conf | 1 -
 distro-configs/LibreOfficeLinux.conf      | 1 -
 distro-configs/LibreOfficeMacOSX.conf     | 1 -
 distro-configs/LibreOfficeOpenBSD.conf    | 1 -
 distro-configs/LibreOfficeWin32.conf      | 1 -
 distro-configs/LibreOfficeiOS.conf        | 1 -
 distro-configs/OxygenOfficeLinux.conf     | 1 -
 distro-configs/OxygenOfficeWin32.conf     | 1 -
 9 files changed, 9 deletions(-)

(limited to 'distro-configs')

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 10b351c29e30..14b31dfd1af4 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -12,7 +12,6 @@
 --disable-mozilla
 --disable-odk
 --disable-opengl
---disable-pdfimport
 --disable-postgresql-sdbc
 --disable-python
 --disable-randr
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 4414b584f5b0..43f1c0be5262 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -12,7 +12,6 @@
 --disable-mozilla
 --disable-odk
 --disable-opengl
---disable-pdfimport
 --disable-postgresql-sdbc
 --disable-python
 --disable-randr
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 6f22043fde6e..0ffc31c96e1e 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -35,7 +35,6 @@
 --enable-ext-presenter-minimizer
 --enable-ext-nlpsolver
 --enable-epm
---enable-pdfimport
 --enable-python=internal
 --enable-online-update
 --disable-unix-qstart-libpng
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 2aa870e594d6..686f5fe424ae 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -9,6 +9,5 @@
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update
---enable-pdfimport
 --without-system-postgresql
 --disable-gtk
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 3862cfebfa51..52ba333fd8c4 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -15,7 +15,6 @@
 --enable-ext-presenter-minimizer
 --enable-ext-report-builder
 --enable-ext-wiki-publisher
---enable-pdfimport
 --enable-python=system
 --with-alloc=system
 --with-ant-home=/usr/local/ant
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index c8f036ade9cd..7c92efe53288 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -14,4 +14,3 @@
 --enable-ext-presenter-minimizer
 --enable-ext-nlpsolver
 --enable-online-update
---enable-pdfimport
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 52fb60f8a9c4..6234d994529a 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -13,7 +13,6 @@
 --disable-mozilla
 --disable-odk
 --disable-opengl
---disable-pdfimport
 --disable-postgresql-sdbc
 --disable-python
 --disable-randr
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 0777056c04a8..0c428a6c3f34 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -51,7 +51,6 @@
 --enable-ext-barcode
 --disable-ext-oooblogger
 --enable-ext-mysql-connector
---enable-pdfimport
 --enable-postgresql-sdbc
 --with-sun-templates
 --enable-neon
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 22aa1374e045..a3a879d36ca1 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -37,5 +37,4 @@
 --enable-graphite
 --enable-dependency-tracking
 --enable-mozilla
---enable-pdfimport
 --with-system-mozilla=mozilla
-- 
cgit