Fix compile issues on Mac OSX 10.3 on midworld dashboard.

Utilities/cmlibarchive/CMakeLists.txt

@@ -478,7 +478,7 @@ CHECK_TYPE_SIZE(gid_t       GID_T)
 IF(NOT HAVE_GID_T)
   IF(WIN32)
     SET(gid_t "short")
-  ELSEIF(WIN32)
+  ELSE(WIN32)
     SET(gid_t "unsigned int")
   ENDIF(WIN32)
 ENDIF(NOT HAVE_GID_T)
@@ -487,7 +487,7 @@ CHECK_TYPE_SIZE(id_t        ID_T)
 IF(NOT HAVE_ID_T)
   IF(WIN32)
     SET(id_t "short")
-  ELSEIF(WIN32)
+  ELSE(WIN32)
     SET(id_t "unsigned int")
   ENDIF(WIN32)
 ENDIF(NOT HAVE_ID_T)
@@ -542,7 +542,7 @@ CHECK_TYPE_SIZE(uid_t       UID_T)
 IF(NOT HAVE_UID_T)
   IF(WIN32)
     SET(uid_t "short")
-  ELSEIF(WIN32)
+  ELSE(WIN32)
     SET(uid_t "unsigned int")
   ENDIF(WIN32)
 ENDIF(NOT HAVE_UID_T)

Utilities/cmlibarchive/libarchive/archive_hash.h

@@ -108,7 +108,7 @@ typedef SHA256_CTX archive_sha256_ctx;
 #  define archive_sha256_init(ctx)      SHA256Init(ctx)
 #  define archive_sha256_final(ctx, buf)    SHA256Final(buf, ctx)
 #  define archive_sha256_update(ctx, buf, n)    SHA256Update(ctx, buf, n)
-#elif defined(HAVE_OPENSSL_SHA_H)
+#elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA256_INIT)
 #  include <openssl/sha.h>
 #  define ARCHIVE_HAS_SHA256
 typedef SHA256_CTX archive_sha256_ctx;
@@ -131,7 +131,7 @@ typedef SHA384_CTX archive_sha384_ctx;
 #  define archive_sha384_init(ctx)      SHA384Init(ctx)
 #  define archive_sha384_final(ctx, buf)    SHA384Final(buf, ctx)
 #  define archive_sha384_update(ctx, buf, n)    SHA384Update(ctx, buf, n)
-#elif defined(HAVE_OPENSSL_SHA_H)
+#elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA384_INIT)
 #  include <openssl/sha.h>
 #  define ARCHIVE_HAS_SHA384
 typedef SHA512_CTX archive_sha384_ctx;
@@ -154,7 +154,7 @@ typedef SHA512_CTX archive_sha512_ctx;
 #  define archive_sha512_init(ctx)      SHA512Init(ctx)
 #  define archive_sha512_final(ctx, buf)    SHA512Final(buf, ctx)
 #  define archive_sha512_update(ctx, buf, n)    SHA512Update(ctx, buf, n)
-#elif defined(HAVE_OPENSSL_SHA_H)
+#elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA512_INIT)
 #  include <openssl/sha.h>
 #  define ARCHIVE_HAS_SHA512
 typedef SHA512_CTX archive_sha512_ctx;