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

diff --git a/Configure b/Configure
index a10ec8d64b2100004d184b05f7f94f201766c877..5bd2556a71b7d6c3cd7e94a6b08839a9d2d09fdf 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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";
 

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 15ce8f09594c78ee06531fe2e7e1d5495a392b52..8e27aaae5e85d81eb4de2fabcbc6d93bc322042c 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -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;
 }
 

diff --git a/util/domd b/util/domd
index c7e28341a6cdf1dd8cd4c5861ac347e528f63668..aa99cb05236391be69b65dbd550950374813614d 100755 (executable)
--- a/util/domd
+++ b/util/domd
@@ -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