Add Ifdefs to support libarchive2 and libarchive3 at the same time..