iOS, avmedia library depend on autogen flag.

Disabled linking of avmedia if not present.

Change-Id: Id64192ec8172d4388b3624b5f832a90f7af1179c

configure.ac

@@ -4030,7 +4030,7 @@ darwin*)
 
     case "$host_cpu" in
     arm)
-        OS=iOS
+        OS=IOS
         if test "$enable_ios_simulator" = "yes"; then
             CPUNAME=I386
             RTL_ARCH=x86
@@ -4042,7 +4042,7 @@ darwin*)
         fi
         ;;
     arm64)
-        OS=iOS
+        OS=IOS
         if test "$enable_ios_simulator" = "yes"; then
             CPUNAME=X86_64
             RTL_ARCH=X86_64

oox/Library_oox.mk

@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_api,oox,\
 ))
 
 $(eval $(call gb_Library_use_libraries,oox,\
-    avmedia \
+    $(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \

svx/Library_svx.mk

@@ -41,8 +41,7 @@ $(eval $(call gb_Library_add_defs,svx,\
 $(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx))
 
 $(eval $(call gb_Library_use_libraries,svx,\
-    $(if $(filter-out $(OS),IOS), \
-        avmedia) \
+    $(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     sb \
     comphelper \