diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-02-14 13:12:00 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-02-14 13:12:00 +0000 |
| commit | c1269c81fd52a031595ec69a4a88ed80df100008 (patch) | |
| tree | b054e32f40bf4598e7b4ecbbd284357cf0ce61ff | |
| parent | 794a386af3cf5617929f3c689b2caf7c5b34f2f7 (diff) | |
Handle krb5 libraries separately and make sure only libssl.so depends
on it.
| -rwxr-xr-x | Configure | 4 | ||||
| -rw-r--r-- | Makefile.org | 6 | ||||
| -rw-r--r-- | apps/Makefile.ssl | 1 | ||||
| -rw-r--r-- | test/Makefile.ssl | 3 |
4 files changed, 11 insertions, 3 deletions
@@ -650,6 +650,7 @@ my $openssl_thread_defines; my $openssl_sys_defines=""; my $openssl_other_defines; my $libs; +my $libkrb5=""; my $target; my $options; my $symlink; @@ -1037,8 +1038,6 @@ else $withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include" if $withargs{"krb5-include"} eq "" && $withargs{"krb5-dir"} ne ""; - - $libs.=$withargs{"krb5-lib"}." " if $withargs{"krb5-lib"} ne ""; } # The DSO code currently always implements all functions so that no @@ -1273,6 +1272,7 @@ while (<IN>) s/^ARFLAGS=.*/ARFLAGS= $arflags/; s/^PERL=.*/PERL= $perl/; s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/; + s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/; s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared); diff --git a/Makefile.org b/Makefile.org index 847bcebad1..1baf7e8b44 100644 --- a/Makefile.org +++ b/Makefile.org @@ -167,6 +167,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o # KRB5 stuff KRB5_INCLUDES= +LIBKRB5= DIRS= crypto ssl engines apps test tools SHLIBDIRS= crypto ssl @@ -280,6 +281,9 @@ build-shared: do_$(SHLIB_TARGET) link-shared do_$(SHLIB_TARGET): @ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ + if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \ + libs="$(LIBKRB5) $$libs"; \ + fi; \ $(NEWMAKE) -f Makefile.shared \ CC="$(CC)" LDFLAGS="$(LDFLAGS)" \ SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ @@ -288,7 +292,7 @@ do_$(SHLIB_TARGET): LIBDEPS="$$libs $(EX_LIBS)" \ LIBRPATH="$(INSTALLTOP)/lib" \ link_a.$(SHLIB_TARGET); \ - libs="$$libs -l$$i"; \ + libs="-l$$i $$libs"; \ done openssl.pc: Makefile.ssl diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index af0002341a..7dce73d610 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -19,6 +19,7 @@ PERL= perl RM= rm -f # KRB5 stuff KRB5_INCLUDES= +LIBKRB5= PEX_LIBS= EX_LIBS= diff --git a/test/Makefile.ssl b/test/Makefile.ssl index a75727b066..344d21ef85 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -16,6 +16,9 @@ MAKE= $(NEWMAKE) -f $(MAKEFILE) MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) PERL= perl +# KRB5 stuff +KRB5_INCLUDES= +LIBKRB5= PEX_LIBS= EX_LIBS= #-lnsl -lsocket |