diff --git a/ChangeLog b/ChangeLog index c40b9a101..392cf8f9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-08-15 Richard Frith-Macdonald + + * SSL/GNUmakefile: Added -lgnustep-base and -lobjc to SSL_BUNDLE_LIBS + So that bundle is linked with a dependency on these libraries ... to + ensure that dynamic linkage works when the bundle is loaded in from + java via jigs. + 2002-08-15 Adam Fedor * SSL/configure.ac: Simplified check for libraries. Added socket diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile index c31bbdb3b..fd42b47d2 100644 --- a/SSL/GNUmakefile +++ b/SSL/GNUmakefile @@ -50,7 +50,7 @@ SSL_OBJC_FILES = GSSSLHandle.m # The principal class in the bundle SSL_PRINCIPAL_CLASS = GSSSLHandle -SSL_BUNDLE_LIBS = $(SSLLIBS) +SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base -lobjc endif diff --git a/SSL/Makefile.preamble b/SSL/Makefile.preamble index 1991dcf75..46a2fb814 100644 --- a/SSL/Makefile.preamble +++ b/SSL/Makefile.preamble @@ -53,7 +53,7 @@ ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) \ -I../Headers/gnustep -I../Headers # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS = +ADDITIONAL_LDFLAGS = # Additional library directories the linker should search ADDITIONAL_LIB_DIRS = -L../Source/$(GNUSTEP_OBJ_DIR)