Worked on tests

libyal · Sep 15, 2017 · 1b5ddd7 · 1b5ddd7
1 parent bf2a894
commit 1b5ddd7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -1,3 +1,7 @@
+dnl Checks for required headers and functions
+dnl
+dnl Version: 20170911
+
 dnl Function to detect if liblnk dependencies are available
 AC_DEFUN([AX_LIBLNK_CHECK_LOCAL],
   [dnl Check for internationalization functions in liblnk/liblnk_i18n.c

diff --git a/appveyor.yml b/appveyor.yml
@@ -37,7 +37,7 @@ environment:
   - TARGET: mingw-w64
 
 install:
-- cmd: git clone https://github.com/libyal/vstools.git && move vstools ..\
+- cmd: git clone https://github.com/libyal/vstools.git ..\vstools
 - cmd: if [%TARGET%]==[cygwin] (
     C:\cygwin\setup-x86.exe -qgnNdO -l C:\cygwin\var\cache\setup -R c:\cygwin -s http://cygwin.mirror.constant.com -P python2-devel -P python3-devel )
 - cmd: if [%TARGET%]==[cygwin64] (

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

diff --git a/m4/libbfio.m4 b/m4/libbfio.m4
@@ -1,6 +1,6 @@
 dnl Checks for libbfio or required headers and functions
 dnl
-dnl Version: 20170911
+dnl Version: 20170912
 
 dnl Function to detect if libbfio is available
 AC_DEFUN([AX_LIBBFIO_CHECK_LIB],
@@ -304,6 +304,16 @@ AC_DEFUN([AX_LIBBFIO_CHECK_LIB],
     ])
   ])
 
+dnl Function to detect if libbfio dependencies are available
+AC_DEFUN([AX_LIBBFIO_CHECK_LOCAL],
+  [dnl No additional checks.
+
+  ac_cv_libbfio_CPPFLAGS="-I../libbfio";
+  ac_cv_libbfio_LIBADD="../libbfio/libbfio.la";
+
+  ac_cv_libbfio=local
+  ])
+
 dnl Function to detect how to enable libbfio
 AC_DEFUN([AX_LIBBFIO_CHECK_ENABLE],
   [AX_COMMON_ARG_WITH(
@@ -319,18 +329,15 @@ AC_DEFUN([AX_LIBBFIO_CHECK_ENABLE],
   dnl Check if the dependencies for the local library version
   AS_IF(
     [test "x$ac_cv_libbfio" != xyes],
-    [AC_DEFINE(
+    [AX_LIBBFIO_CHECK_LOCAL
+
+    AC_DEFINE(
       [HAVE_LOCAL_LIBBFIO],
       [1],
       [Define to 1 if the local version of libbfio is used.])
     AC_SUBST(
       [HAVE_LOCAL_LIBBFIO],
       [1])
-
-    ac_cv_libbfio_CPPFLAGS="-I../libbfio";
-    ac_cv_libbfio_LIBADD="../libbfio/libbfio.la";
-
-    ac_cv_libbfio=local
     ])
 
   AM_CONDITIONAL(