rpms/openoffice.org/devel workspace.cmcfixes49.patch,1.3,1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27809

Modified Files:
	workspace.cmcfixes49.patch 
Log Message:
readjust

workspace.cmcfixes49.patch:

Index: workspace.cmcfixes49.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes49.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cmcfixes49.patch	24 Aug 2008 10:34:11 -0000	1.3
+++ workspace.cmcfixes49.patch	30 Aug 2008 10:57:57 -0000	1.4
@@ -1,6 +1,6 @@
 --- config_office/configure.in	31 Jul 2008 13:49:05 -0000	1.282
 +++ config_office/configure.in	19 Aug 2008 13:33:04 -0000
-@@ -345,6 +345,9 @@
+@@ -342,6 +342,9 @@
  AC_ARG_WITH(system-icu,
  [  --with-system-icu       Use icu already on system
  ],,)
@@ -10,28 +10,39 @@
  AC_ARG_WITH(system-db,
  [  --with-system-db        Use berkeley db already on system
  ],,)
-@@ -5470,13 +5473,31 @@
+@@ -5390,19 +5393,38 @@
  AC_MSG_CHECKING([whether to build the PDF Import extension])
- if test -z "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
+ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
    AC_MSG_RESULT([yes])
--  BUILD_TYPE="$BUILD_TYPE XPDF"
-   ENABLE_PDFIMPORT=YES
-+
+-  AC_MSG_CHECKING([for xpdf module])
+-   if test -d ../xpdf; then
++ 
 +  dnl ===================================================================
 +  dnl Check for system poppler
 +  dnl ===================================================================
 +  AC_MSG_CHECKING([which pdf backend to use])
 +  if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
-+  	test "$with_system_poppler" != "no"; then
++      test "$with_system_poppler" != "no"; then
 +      AC_MSG_RESULT([external])
 +      SYSTEM_POPPLER=YES
 +      PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
 +  else
 +      AC_MSG_RESULT([internal])
 +      SYSTEM_POPPLER=NO
++
++      AC_MSG_CHECKING([for xpdf module])
++       if test -d ../xpdf; then
+ 	AC_MSG_RESULT([OK])
+-   else
++       else
+ 	AC_MSG_ERROR([not existing. get it (or Extensions3)])
+-   fi
+-  BUILD_TYPE="$BUILD_TYPE XPDF"
++       fi
++
 +      BUILD_TYPE="$BUILD_TYPE XPDF"
 +  fi
-+
+   ENABLE_PDFIMPORT=YES
  else
    AC_MSG_RESULT([no])
    ENABLE_PDFIMPORT=NO
@@ -41,8 +52,8 @@
 +AC_SUBST(POPPLER_CFLAGS)
 +AC_SUBST(POPPLER_LIBS)
  
- AC_MSG_CHECKING([whether to build the MediaWiki Editor extension])
- if test -z "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
+ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+    AC_MSG_CHECKING([for sdext module])
 --- config_office/set_soenv.in	31 Jul 2008 13:53:05 -0000	1.196
 +++ config_office/set_soenv.in	19 Aug 2008 13:33:05 -0000
 @@ -1998,6 +1998,9 @@