generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle krb5 libraries separately and make sure only libssl.so depends

Browse Source 
on it.
This commit is contained in:
Richard Levitte 2003-02-14 13:12:00 +00:00
parent 794a386af3
commit c1269c81fd
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configure
View File

@ -650,6 +650,7 @@ my $openssl_thread_defines;
my $openssl_sys_defines=""; my $openssl_sys_defines="";
my $openssl_other_defines; my $openssl_other_defines;
my $libs; my $libs;
my $libkrb5="";
my $target; my $target;
my $options; my $options;
my $symlink; my $symlink;
@ -1037,8 +1038,6 @@ else
$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include" $withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
if $withargs{"krb5-include"} eq "" && if $withargs{"krb5-include"} eq "" &&
$withargs{"krb5-dir"} ne ""; $withargs{"krb5-dir"} ne "";
$libs.=$withargs{"krb5-lib"}." " if $withargs{"krb5-lib"} ne "";
} }
# The DSO code currently always implements all functions so that no # The DSO code currently always implements all functions so that no
@ -1273,6 +1272,7 @@ while (<IN>)
s/^ARFLAGS=.*/ARFLAGS= $arflags/; s/^ARFLAGS=.*/ARFLAGS= $arflags/;
s/^PERL=.*/PERL= $perl/; s/^PERL=.*/PERL= $perl/;
s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/; s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/; s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared); s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);

6
Makefile.org
View File

@ -167,6 +167,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o
# KRB5 stuff # KRB5 stuff
KRB5_INCLUDES= KRB5_INCLUDES=
LIBKRB5=
DIRS= crypto ssl engines apps test tools DIRS= crypto ssl engines apps test tools
SHLIBDIRS= crypto ssl SHLIBDIRS= crypto ssl
@ -280,6 +281,9 @@ build-shared: do_$(SHLIB_TARGET) link-shared
do_$(SHLIB_TARGET): do_$(SHLIB_TARGET):
@ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ @ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
libs="$(LIBKRB5) $$libs"; \
fi; \
$(NEWMAKE) -f Makefile.shared \ $(NEWMAKE) -f Makefile.shared \
CC="$(CC)" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
@ -288,7 +292,7 @@ do_$(SHLIB_TARGET):
LIBDEPS="$$libs $(EX_LIBS)" \ LIBDEPS="$$libs $(EX_LIBS)" \
LIBRPATH="$(INSTALLTOP)/lib" \ LIBRPATH="$(INSTALLTOP)/lib" \
link_a.$(SHLIB_TARGET); \ link_a.$(SHLIB_TARGET); \
libs="$$libs -l$$i"; \ libs="-l$$i $$libs"; \
done done
openssl.pc: Makefile.ssl openssl.pc: Makefile.ssl

1
apps/Makefile.ssl
View File

@ -19,6 +19,7 @@ PERL= perl
RM= rm -f RM= rm -f
# KRB5 stuff # KRB5 stuff
KRB5_INCLUDES= KRB5_INCLUDES=
LIBKRB5=
PEX_LIBS= PEX_LIBS=
EX_LIBS= EX_LIBS=

3
test/Makefile.ssl
View File

@ -16,6 +16,9 @@ MAKE= $(NEWMAKE) -f $(MAKEFILE)
MAKEDEPPROG= makedepend MAKEDEPPROG= makedepend
MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
PERL= perl PERL= perl
# KRB5 stuff
KRB5_INCLUDES=
LIBKRB5=
PEX_LIBS= PEX_LIBS=
EX_LIBS= #-lnsl -lsocket EX_LIBS= #-lnsl -lsocket