#i80097# correctly conditionalize svp plugin. Patch by pl

scp2/source/ooo/file_library_ooo.scp

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: file_library_ooo.scp,v $
  *
- *  $Revision: 1.254 $
+ *  $Revision: 1.255 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-24 11:25:04 $
+ *  last change: $Author: rt $ $Date: 2007-07-27 10:32:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1733,7 +1733,7 @@ File gid_File_Lib_Basebmp
 End
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined QUARTZ
 STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE_PATCH( gid_File_Lib_BaseBmp, basebmp )
 #endif

scp2/source/ooo/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.56 $
+#   $Revision: 1.57 $
 #
-#   last change: $Author: rt $ $Date: 2007-07-24 10:35:13 $
+#   last change: $Author: rt $ $Date: 2007-07-27 10:32:55 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -271,7 +271,7 @@ ULFFILES=                          \
         registryitem_ooo.ulf       \
         module_systemint.ulf
 
-.IF "$(GUI)"=="UNX"
+.IF "$(GUIBASE)"=="unx"
     PARFILES+=module_headless.par
     ULFFILES+=module_headless.ulf
 .ENDIF