Commit 75e98d05 authored by Ben Laurie's avatar Ben Laurie
Browse files

This ghastly hack prevents CVS wars over Kerberos (which is disabled by default).

parent e9eb000c

Configure

+2 −0
Original line number Diff line number Diff line
@@ -1099,7 +1099,9 @@ $openssl_thread_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#end 
$openssl_sys_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;

$openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;

print OUT $openssl_sys_defines;

print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n";

print OUT $openssl_algorithm_defines;

print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n";

print OUT $openssl_thread_defines;

print OUT $openssl_other_defines,"\n";

util/clean-depend.pl

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ while(<STDIN>) { 
    @deps=grep(!/^\//,@deps);

    @deps=grep(!/^\\$/,@deps);

    @deps=grep(!/^$origfile$/,@deps);

# pull out the kludged kerberos header (if present).

    @deps=grep(!/^[.\/]+\/krb5.h/,@deps);

    push @{$files{$thisfile}},@deps;

}

util/domd

+6 −2
Original line number Diff line number Diff line
@@ -12,14 +12,18 @@ fi 
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi



cp Makefile.ssl Makefile.save

# fake the presence of Kerberos

touch $TOP/krb5.h

if [ "$MAKEDEPEND" = "gcc" ]; then

    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp

    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp

    gcc -M $@ >> Makefile.tmp

    gcc -D OPENSSL_DOING_MAKEDEPEND -M $@ >> Makefile.tmp

    perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new

    rm -f Makefile.tmp

else

    ${MAKEDEPEND} -f Makefile.ssl $@

    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@

    perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new

fi

mv Makefile.new Makefile.ssl

# unfake the presence of Kerberos

rm $TOP/krb5.h