Recent version of libewf have removed LIBEWF_HANDLE type, use libewf_handle_t is available
This commit is contained in:
parent
fb86625be2
commit
b7397dc2aa
3 changed files with 15 additions and 6 deletions
13
compile.sh
13
compile.sh
|
@ -5,8 +5,8 @@
|
||||||
VER_E2FSPROGS=
|
VER_E2FSPROGS=
|
||||||
VER_PROGSREISERFS=0.3.1-rc8
|
VER_PROGSREISERFS=0.3.1-rc8
|
||||||
VER_NTFSPROGS=2.0.0
|
VER_NTFSPROGS=2.0.0
|
||||||
#VER_LIBEWF=20090510
|
|
||||||
VER_LIBEWF=20100226
|
VER_LIBEWF=20100226
|
||||||
|
#VER_LIBEWF=20110312
|
||||||
smp_mflags="-j 2"
|
smp_mflags="-j 2"
|
||||||
crosscompile_target=
|
crosscompile_target=
|
||||||
prefix=/usr/
|
prefix=/usr/
|
||||||
|
@ -171,17 +171,18 @@ CONFIGUREOPT="$CONFIGUREOPT --with-ewf-lib=${PWDSRC}/libewf-${VER_LIBEWF}/libewf
|
||||||
|
|
||||||
if [ ! -e $compiledir/libewf-$VER_LIBEWF/configure ];
|
if [ ! -e $compiledir/libewf-$VER_LIBEWF/configure ];
|
||||||
then
|
then
|
||||||
if [ ! -e libewf-$VER_LIBEWF.tar.gz ];
|
if [ ! -e libewf-$VER_LIBEWF.tar.gz -a ! -e libewf-alpha -$VER_LIBEWF.tar.gz -a ! -e libewf-beta-$VER_LIBEWF.tar.gz ];
|
||||||
then
|
then
|
||||||
if [ ! -e libewf-beta-$VER_LIBEWF.tar.gz ];
|
$LYNX "http://sourceforge.net/project/platformdownload.php?group_id=167783"
|
||||||
then
|
|
||||||
$LYNX "http://sourceforge.net/project/platformdownload.php?group_id=167783"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if [ -e libewf-$VER_LIBEWF.tar.gz ];
|
if [ -e libewf-$VER_LIBEWF.tar.gz ];
|
||||||
then
|
then
|
||||||
tar xzf libewf-$VER_LIBEWF.tar.gz -C $compiledir
|
tar xzf libewf-$VER_LIBEWF.tar.gz -C $compiledir
|
||||||
fi
|
fi
|
||||||
|
if [ -e libewf-alpha-$VER_LIBEWF.tar.gz ];
|
||||||
|
then
|
||||||
|
tar xzf libewf-alpha-$VER_LIBEWF.tar.gz -C $compiledir
|
||||||
|
fi
|
||||||
if [ -e libewf-beta-$VER_LIBEWF.tar.gz ];
|
if [ -e libewf-beta-$VER_LIBEWF.tar.gz ];
|
||||||
then
|
then
|
||||||
tar xzf libewf-beta-$VER_LIBEWF.tar.gz -C $compiledir
|
tar xzf libewf-beta-$VER_LIBEWF.tar.gz -C $compiledir
|
||||||
|
|
|
@ -633,6 +633,10 @@ if test -z "${use_ewf}"; then
|
||||||
if test "${ac_cv_c_libewf_get_media_size_have_two_arguments}" != "no"; then
|
if test "${ac_cv_c_libewf_get_media_size_have_two_arguments}" != "no"; then
|
||||||
AC_DEFINE([LIBEWF_GET_MEDIA_SIZE_HAVE_TWO_ARGUMENTS], 1, [Define if libewf_get_media_size takes two parameters.])
|
AC_DEFINE([LIBEWF_GET_MEDIA_SIZE_HAVE_TWO_ARGUMENTS], 1, [Define if libewf_get_media_size takes two parameters.])
|
||||||
fi
|
fi
|
||||||
|
AC_CHECK_TYPE(
|
||||||
|
[libewf_handle_t],
|
||||||
|
[AC_DEFINE( [HAVE_LIBEWF_HANDLE_T], [1], [Define to 1 if libewf_handle_t is available])],,
|
||||||
|
[#include <libewf.h>])
|
||||||
],[
|
],[
|
||||||
AC_MSG_WARN(No ewf library detected)
|
AC_MSG_WARN(No ewf library detected)
|
||||||
],[])
|
],[])
|
||||||
|
|
|
@ -65,7 +65,11 @@ static int fewf_sync(disk_t *disk);
|
||||||
|
|
||||||
struct info_fewf_struct
|
struct info_fewf_struct
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_LIBEWF_HANDLE_T
|
||||||
|
libewf_handle_t *handle;
|
||||||
|
#else
|
||||||
LIBEWF_HANDLE *handle;
|
LIBEWF_HANDLE *handle;
|
||||||
|
#endif
|
||||||
uint64_t offset;
|
uint64_t offset;
|
||||||
char file_name[DISKNAME_MAX];
|
char file_name[DISKNAME_MAX];
|
||||||
int mode;
|
int mode;
|
||||||
|
|
Loading…
Reference in a new issue