diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 17:41:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 17:41:01 +0100 |
| commit | f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 (patch) | |
| tree | 47d4d29b51a96958d5aa0653dc3368e3d1be20e1 /scp2 | |
| parent | b479f7f7675b8a539b35faaa6edcd282e09bba97 (diff) | |
Key all browser plugin features to --enable-nsplugin
...instead of having them spread across --enable-nsplugin (plug LO into browser
windows) and --enable-mozilla (plug browser plugins into LO documents). The
ultimate goal is to clean up the various configure options mentioning "mozilla"
and WITH_MOZILLA.
Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b4bb3929f285..1e038f8c284b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) -#ifndef WITHOUT_MOZILLA +#if defined ENABLE_NSPLUGIN STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index eaf929478a1f..b73224858ae2 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -103,6 +103,7 @@ File gid_File_Basic_Tutorials End #ifdef ENABLE_NSPLUGIN + File gid_File_Exe_Nsplugin BIN_FILE_BODY; Styles = (PACKED); @@ -113,8 +114,18 @@ File gid_File_Exe_Nsplugin Name = "nsplugin.exe"; #endif End + +#if defined(UNX) && !defined(QUARTZ) +File gid_File_Bin_Pluginapp + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = "pluginapp.bin"; + Styles = (PACKED); +End #endif +#endif // ENABLE_NSPLUGIN + File gid_File_Bin_Gengal BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -148,17 +159,6 @@ End #endif -#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ) - -File gid_File_Bin_Pluginapp - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pluginapp.bin"; - Styles = (PACKED); -End - -#endif - #ifdef UNX File gid_File_Bin_Open_Url |