pull up r24525 from trunk

 ------------------------------------------------------------------------
 r24525 | ghudson | 2010-11-21 12:35:49 -0500 (Sun, 21 Nov 2010) | 4 lines

 Suppress building camellia-gen in "make check" for now (it has a build
 issue on Solaris which will go away when Camellia support becomes
 unconditional).

ticket: 6847
version_fixed: 1.9.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24608 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index e6c86bc131e232d1b0509956b2ddbd89a5b6ee23..b11716ecc903712d8b576a8b94223e1f7fbcf0b3 100644 (file)
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -39,7 +39,8 @@ camellia-gen: camellia-gen.o $(GEN_OBJS)
 run-camellia-gen: camellia-gen
        ./camellia-gen > kresults.out
 
-check:: run-camellia-gen
+# Enable when Camellia support becomes unconditional.
+#check:: run-camellia-gen
 
 
 clean-unix:: clean-libobjs