ooo-build r13846 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Sep  8 15:44:51 2008
New Revision: 13846
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13846&view=rev

Log:
    * patches/dev300/pdfimport-system-poppler.diff:
    * patches/dev300/pdfimport-system-poppler-m29.diff:
    * patches/dev300/pdfimport-system-poppler-m30.diff: disable
    building in xpdfwrapper dir when pdfimport is switched off.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/pdfimport-system-poppler-m29.diff
   trunk/patches/dev300/pdfimport-system-poppler-m30.diff
   trunk/patches/dev300/pdfimport-system-poppler.diff

Modified: trunk/patches/dev300/pdfimport-system-poppler-m29.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-system-poppler-m29.diff	(original)
+++ trunk/patches/dev300/pdfimport-system-poppler-m29.diff	Mon Sep  8 15:44:51 2008
@@ -40062,9 +40062,9 @@
 +restoreState
 +restoreState
 +endPage
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ filter/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
-@@ -0,0 +1,76 @@
+--- /dev/null
++++ filter/source/pdfimport/xpdfwrapper/makefile.mk
+@@ -0,0 +1,82 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40115,6 +40115,12 @@
 +.ENDIF
 +
 +# --- Files --------------------------------------------------------
++
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++	@echo "PDF Import extension disabled."
++.ENDIF
++
 +UWINAPILIB:=
 +APP1TARGET=$(TARGET)
 +APP1LIBSALCPPRT=

Modified: trunk/patches/dev300/pdfimport-system-poppler-m30.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-system-poppler-m30.diff	(original)
+++ trunk/patches/dev300/pdfimport-system-poppler-m30.diff	Mon Sep  8 15:44:51 2008
@@ -40061,7 +40061,7 @@
 +endPage
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,82 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40112,6 +40112,12 @@
 +.ENDIF
 +
 +# --- Files --------------------------------------------------------
++
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++	@echo "PDF Import extension disabled."
++.ENDIF
++
 +UWINAPILIB:=
 +APP1TARGET=$(TARGET)
 +APP1LIBSALCPPRT=

Modified: trunk/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-system-poppler.diff	(original)
+++ trunk/patches/dev300/pdfimport-system-poppler.diff	Mon Sep  8 15:44:51 2008
@@ -40071,7 +40071,7 @@
 +endPage
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	19 Aug 2008 15:13:55 -0000
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,82 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40122,6 +40122,12 @@
 +.ENDIF
 +
 +# --- Files --------------------------------------------------------
++
++.IF "$(ENABLE_PDFIMPORT)" == "NO"
++ all:
++	@echo "PDF Import extension disabled."
++.ENDIF
++
 +UWINAPILIB:=
 +APP1TARGET=$(TARGET)
 +APP1LIBSALCPPRT=