ucb: move APR dependencies to gb_LinkTarget__use_apr

Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9

RepositoryExternal.mk

@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(APR_LIBS) \
+	$(if $(filter $(OS),LINUX),-lpthread) \
+	$(if $(filter $(OS),MACOSX),-liconv) \
 )
 
 ifeq ($(SYSTEM_APR),)

ucb/Library_ucpdav1.mk

@@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_add_libs,ucpdav1,\
-	$(if $(filter $(OS),LINUX),-lpthread) \
-	$(if $(filter $(OS),MACOSX),-liconv) \
-))
-
 $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 	ucb/source/ucp/webdav/AprEnv \
 	ucb/source/ucp/webdav/ContentProperties \