Merge pull request #106 from orex/corrected

Corrected

diff --cc Makefile.am
Simple merge

diff --cc libarchive/CMakeLists.txt
Simple merge

diff --cc libarchive/archive.h
Simple merge

diff --cc libarchive/test/CMakeLists.txt
Simple merge