Updated m4 scripts.

joelvaneenwyk · Mar 27, 2016 · b570af6 · b570af6
1 parent ec02fad
commit b570af6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -76,6 +76,10 @@ Debug:
 Recovery:
 * scan for records in chunk free space
 
+20150929
+* updated m4 scripts
+* updated dependencies
+
 20150823
 * changed version for pypi repacking
 

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

diff --git a/m4/libcsystem.m4 b/m4/libcsystem.m4
@@ -1,6 +1,6 @@
 dnl Functions for libcsystem
 dnl
-dnl Version: 20141018
+dnl Version: 20150629
 
 dnl Function to detect if libcsystem is available
 dnl ac_libcsystem_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -24,7 +24,7 @@ AC_DEFUN([AX_LIBCSYSTEM_CHECK_LIB],
    [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
    [PKG_CHECK_MODULES(
     [libcsystem],
-    [libcsystem >= 20141018],
+    [libcsystem >= 20150629],
     [ac_cv_libcsystem=yes],
     [ac_cv_libcsystem=no])
    ])
@@ -42,12 +42,6 @@ AC_DEFUN([AX_LIBCSYSTEM_CHECK_LIB],
     [dnl Check for the individual functions
     ac_cv_libcsystem=yes
 
-    AC_CHECK_LIB(
-     csystem,
-     libcsystem_get_version,
-     [ac_cv_libcsystem_dummy=yes],
-     [ac_cv_libcsystem=no])
-
     dnl Support functions
     AC_CHECK_LIB(
      csystem,

diff --git a/m4/libfdata.m4 b/m4/libfdata.m4
@@ -1,6 +1,6 @@
 dnl Functions for libfdata
 dnl
-dnl Version: 20140915
+dnl Version: 20150825
 
 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 >= 20140915],
+    [libfdata >= 20150825],
     [ac_cv_libfdata=yes],
     [ac_cv_libfdata=no])
    ])
@@ -106,7 +106,17 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB],
      libfdata_stream_append_segment,
      [ac_cv_libfdata_dummy=yes],
      [ac_cv_libfdata=no])
+    AC_CHECK_LIB(
+     fdata,
+     libfdata_stream_set_mapped_size,
+     [ac_cv_libfdata_dummy=yes],
+     [ac_cv_libfdata=no])
  
+    AC_CHECK_LIB(
+     fdata,
+     libfdata_stream_get_segment_mapped_range,
+     [ac_cv_libfdata_dummy=yes],
+     [ac_cv_libfdata=no])
     AC_CHECK_LIB(
      fdata,
      libfdata_stream_get_segment_index_at_offset,

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

diff --git a/m4/types.m4 b/m4/types.m4
@@ -1,6 +1,6 @@
 dnl Functions for type definitions
 dnl
-dnl Version: 20111004
+dnl Version: 20150413
 
 dnl Function to detect if type definitions are available
 AC_DEFUN([AX_TYPES_CHECK_LOCAL],
@@ -114,6 +114,7 @@ AC_DEFUN([AX_TYPES_CHECK_LOCAL],
  AC_CHECK_TYPE([ssize_t])
  AC_CHECK_TYPE([u64])
  
+ AC_CHECK_SIZEOF([int])
  AC_CHECK_SIZEOF([off_t])
  AC_CHECK_SIZEOF([size_t])