fdo#60491: scp2: always package emboleobj library on non-WNT platforms

(regression from 09cd5c46, which defined
 DISABLE_ATL on all platforms in configure)

Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda

postprocess/Rdb_services.mk

@@ -142,9 +142,12 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(filter headless,$(GUIBASE)), \
 		vcl/vcl.headless \
 	) \
+	$(if $(filter-out WNT,$(OS)), \
+		embeddedobj/source/msole/emboleobj \
+	) \
 	$(if $(DISABLE_ATL),, \
-		embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows) \
 		$(if $(filter WNT,$(OS)), \
+			embeddedobj/source/msole/emboleobj.windows \
 			embedserv/util/emser \
 			extensions/source/ole/oleautobridge \
 		) \

scp2/source/ooo/file_library_ooo.scp

@@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
-#ifndef DISABLE_ATL
+/* fdo#60491 always need emboleobj library on non-WNT platforms */
+#if !defined(WNT) || !defined(DISABLE_ATL)
 SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #endif