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

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

(cherry picked from commit ca8ac449)

Conflicts:
	postprocess/Rdb_services.mk

Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Reviewed-on: https://gerrit.libreoffice.org/2095Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

postprocess/packcomponents/makefile.mk

@@ -224,12 +224,12 @@ my_components += \
 
 .ENDIF
 
-.IF "$(DISABLE_ATL)" == ""
 .IF "$(OS)" == "WNT"
+.IF "$(DISABLE_ATL)" == ""
 my_components += component/embeddedobj/source/msole/emboleobj.windows
+.ENDIF
 .ELSE
 my_components += component/embeddedobj/source/msole/emboleobj
-.ENDIF
 .END
 
 .IF "$(DISABLE_NEON)" != "TRUE"

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