Updated dependencies and corresponding changes.

joelvaneenwyk · Mar 27, 2016 · 6b9648e · 6b9648e
1 parent 473d527
commit 6b9648e
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,13 @@
 # Files to ignore by git
 #
-# Version: 20130922
+# Version: 20141004
 
 # Generic auto-generated build files
 *~
 *.a
 *.la
 *.lai
+*.lineno
 *.lo
 *.Plo
 *.Po

diff --git a/ChangeLog b/ChangeLog
@@ -76,6 +76,9 @@ Debug:
 Recovery:
 * scan for records in chunk free space
 
+20141009
+* updated dependencies and corresponding changes
+
 20141004
 * update Python-bindings tests
 

diff --git a/autogen.sh b/autogen.sh
@@ -1,63 +1,93 @@
 #!/bin/sh
 # Script to generate ./configure using the autotools
 #
-# Version: 20130509
+# Version: 20141007
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
 
-ACLOCAL="/usr/bin/aclocal";
-AUTOCONF="/usr/bin/autoconf";
-AUTOHEADER="/usr/bin/autoheader";
-AUTOMAKE="/usr/bin/automake";
-AUTOPOINT="/usr/bin/autopoint";
-AUTORECONF="/usr/bin/autoreconf";
-LIBTOOLIZE="/usr/bin/libtoolize";
+BINDIR="/usr/bin";
 
-if [ -x "${AUTORECONF}" ];
+if ! test -x "${BINDIR}/pkg-config";
+then
+	BINDIR="/usr/local/bin";
+fi
+if ! test -x "${BINDIR}/pkg-config";
+then
+	BINDIR="/usr/local/bin";
+fi
+if ! test -x "${BINDIR}/pkg-config";
+then
+	# Default location of MacPorts installed binaries.
+	BINDIR="/opt/local/bin";
+fi
+if ! test -x "${BINDIR}/pkg-config";
+then
+	# Default location of MSYS-MinGW installed binaries.
+	BINDIR="/mingw/bin";
+fi
+
+PKGCONFIG="${BINDIR}/pkg-config";
+
+if ! test -x "${PKGCONFIG}";
+then
+	echo "Unable to find: pkg-config";
+
+	exit ${EXIT_FAILURE};
+fi
+
+ACLOCAL="${BINDIR}/aclocal";
+AUTOCONF="${BINDIR}/autoconf";
+AUTOHEADER="${BINDIR}/autoheader";
+AUTOMAKE="${BINDIR}/automake";
+AUTOPOINT="${BINDIR}/autopoint";
+AUTORECONF="${BINDIR}/autoreconf";
+LIBTOOLIZE="${BINDIR}/libtoolize";
+
+if test -x "${AUTORECONF}";
 then
 	${AUTORECONF} --force --install
 else
-	if [ ! -x "${ACLOCAL}" ];
+	if ! test -x "${ACLOCAL}";
 	then
 		echo "Unable to find: aclocal";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
-	if [ ! -x "${AUTOCONF}" ];
+	if ! test -x "${AUTOCONF}";
 		then
 		echo "Unable to find: autoconf";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
-	if [ ! -x "${AUTOHEADER}" ];
+	if ! test -x "${AUTOHEADER}";
 	then
 		echo "Unable to find: autoheader";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
-	if [ ! -x "${AUTOMAKE}" ];
+	if ! test -x "${AUTOMAKE}";
 	then
 		echo "Unable to find: automake";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
-	if [ ! -x "${AUTOPOINT}" ];
+	if ! test -x "${AUTOPOINT}";
 	then
 		echo "Unable to find: autopoint";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
-	if [ ! -x "${LIBTOOLIZE}" ];
+	if ! test -x "${LIBTOOLIZE}";
 	then
 		echo "Unable to find: libtoolize";
 
-		echo ${EXIT_FAILURE};
+		exit ${EXIT_FAILURE};
 	fi
 
 	${AUTOPOINT} --force

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libevtx],
- [20141004],
+ [20141009],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(

diff --git a/libevtx/libevtx_file.c b/libevtx/libevtx_file.c
@@ -995,7 +995,7 @@ int libevtx_file_open_read(
 	     NULL,
 	     (int (*)(intptr_t *, intptr_t *, libfdata_vector_t *, libfcache_cache_t *, int, int, off64_t, size64_t, uint32_t, uint8_t, libcerror_error_t **)) &libevtx_io_handle_read_chunk,
 	     NULL,
-	     LIBFDATA_FLAG_DATA_HANDLE_NON_MANAGED,
+	     LIBFDATA_DATA_HANDLE_FLAG_NON_MANAGED,
 	     error ) != 1 )
 	{
 		libcerror_error_set(
@@ -1070,7 +1070,7 @@ int libevtx_file_open_read(
 	     NULL,
 	     (int (*)(intptr_t *, intptr_t *, libfdata_list_element_t *, libfcache_cache_t *, int, off64_t, size64_t, uint32_t, uint8_t, libcerror_error_t **)) &libevtx_chunks_table_read_record,
 	     NULL,
-	     LIBFDATA_FLAG_DATA_HANDLE_MANAGED,
+	     LIBFDATA_DATA_HANDLE_FLAG_MANAGED,
 	     error ) != 1 )
 	{
 		libcerror_error_set(
@@ -1091,7 +1091,7 @@ int libevtx_file_open_read(
 	     NULL,
 	     (int (*)(intptr_t *, intptr_t *, libfdata_list_element_t *, libfcache_cache_t *, int, off64_t, size64_t, uint32_t, uint8_t, libcerror_error_t **)) &libevtx_chunks_table_read_record,
 	     NULL,
-	     LIBFDATA_FLAG_DATA_HANDLE_NON_MANAGED,
+	     LIBFDATA_DATA_HANDLE_FLAG_NON_MANAGED,
 	     error ) != 1 )
 	{
 		libcerror_error_set(

diff --git a/m4/libfdata.m4 b/m4/libfdata.m4
@@ -1,6 +1,6 @@
 dnl Functions for libfdata
 dnl
-dnl Version: 20140601
+dnl Version: 20140915
 
 dnl Function to detect if libfdata is available
 dnl ac_libfdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -24,7 +24,7 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB],
    [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
    [PKG_CHECK_MODULES(
     [libfdata],
-    [libfdata >= 20140601],
+    [libfdata >= 20140915],
     [ac_cv_libfdata=yes],
     [ac_cv_libfdata=no])
    ])