RepositoryExternal.mk (9646dec5) RepositoryExternal.mk (e350def3)
1###############################################################
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 347 unchanged lines hidden (view full) ---

356 $$(INCLUDE) \
357 $(OPENSSL_CFLAGS) \
358)
359$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
360endef
361
362else # !SYSTEM_OPENSSL
363
1###############################################################
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 347 unchanged lines hidden (view full) ---

356 $$(INCLUDE) \
357 $(OPENSSL_CFLAGS) \
358)
359$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
360endef
361
362else # !SYSTEM_OPENSSL
363
364ifeq ($(OS),WNT)
365$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
366 crypto \
367 ssl \
368))
364$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
365 crypto \
366 ssl \
367))
369else
370$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
371 crypto \
372 ssl \
373))
374endif
375
376define gb_LinkTarget__use_openssl
368
369define gb_LinkTarget__use_openssl
377ifeq ($(OS),WNT)
378$(call gb_LinkTarget_add_linked_libs,$(1),\
379 crypto \
380 ssl \
381)
370$(call gb_LinkTarget_add_linked_libs,$(1),\
371 crypto \
372 ssl \
373)
382else
383$(call gb_LinkTarget_add_linked_static_libs,$(1),\
384 crypto \
385 ssl \
386)
387ifeq ($(OS),SOLARIS)
388$(call gb_LinkTarget_add_libs,$(1),\
389 -lnsl \
390 -lsocket \
391)
392endif
374ifeq ($(OS),SOLARIS)
375$(call gb_LinkTarget_add_libs,$(1),\
376 -lnsl \
377 -lsocket \
378)
379endif
380ifeq ($(OS),LINUX)
381$(call gb_LinkTarget_add_libs,$(1),\
382 -lpthread \
383)
393endif
394endef
395
396endif # SYSTEM_OPENSSL
397
398
399ifeq ($(SYSTEM_CURL),YES)
400

--- 230 unchanged lines hidden --- 		384endif
385endef
386
387endif # SYSTEM_OPENSSL
388
389
390ifeq ($(SYSTEM_CURL),YES)
391

--- 230 unchanged lines hidden ---