From 16df2cfa6ef4f40e4b9f67c2056dce0f3aae4f26 Mon Sep 17 00:00:00 2001
From: Pascal Junck <pjunck@openoffice.org>
Date: Tue, 2 Nov 2004 13:57:48 +0000
Subject: INTEGRATION: CWS hroqfix01 (1.37.26); FILE MERGED 2004/10/28 12:59:04
 hro 1.37.26.1: #i33509# Don't pack nsplugin if no gtk+ is availiable

---
 scp2/source/ooo/file_ooo.scp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scp2')

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a25651ff64c2..94292ac06f54 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: file_ooo.scp,v $
 *
-*  $Revision: 1.41 $
+*  $Revision: 1.42 $
 *
-*  last change: $Author: pjunck $ $Date: 2004-10-27 13:46:52 $
+*  last change: $Author: pjunck $ $Date: 2004-11-02 14:57:48 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -195,6 +195,7 @@ File gid_File_Bin_MsiPkgchk
 End
 #endif
 
+#if !defined(UNX) || defined(ENABLE_GTK)
 File gid_File_Lib_Npsoplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
@@ -205,7 +206,9 @@ File gid_File_Lib_Npsoplugin
         Name            = "npsoplugin.dll";
  #endif
 End
+#endif
 
+#if !defined(UNX) || defined(ENABLE_GTK)
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
@@ -215,8 +218,8 @@ File gid_File_Exe_Nsplugin
  #else
     Name = "nsplugin.exe";
   #endif
-
 End
+#endif
 
 File gid_File_Bin_Uno
     BIN_FILE_BODY;
-- 
cgit v1.2.3