Merge r2019 from trunk: Use archive.h from this package, not the system.

SVN-Revision: 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12249d9..cea37d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -726,7 +726,7 @@
 #
 #
 #
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libarchive)
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/libarchive)
 #
 IF(MSVC)
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)