Applied updates

libyal · Jul 30, 2018 · 2a8b355 · 2a8b355
1 parent c1cc8a1
commit 2a8b355
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -236,7 +236,7 @@ script:
         VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` &&
         make install DESTDIR=${PWD}/osx-pkg &&
         mkdir -p ${PWD}/osx-pkg/usr/share/doc/libesedb &&
-        cp COPYING ${PWD}/osx-pkg/usr/share/doc/libesedb/LICENSE &&
+        cp AUTHORS COPYING NEWS README ${PWD}/osx-pkg/usr/share/doc/libesedb &&
         pkgbuild --root osx-pkg --identifier com.github.libyal.libesedb --version ${VERSION} --ownership recommended ../libesedb-${VERSION}.pkg;
       fi
     fi

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libesedb],
- [20180729],
+ [20180730],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
@@ -114,6 +114,19 @@ AX_LIBESEDB_CHECK_LOCAL
 dnl Check if libesedb Python bindings (pyesedb) required headers and functions are available
 AX_PYTHON_CHECK_ENABLE
 
+AS_IF(
+  [test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno],
+  [AC_CHECK_HEADERS([stdarg.h varargs.h])
+
+  AS_IF(
+    [test "x$ac_cv_header_stdarg_h" != xyes && test "x$ac_cv_header_varargs_h" != xyes],
+    [dnl Headers included in pyesedb/pyesedb_error.c
+    AC_MSG_FAILURE(
+      [Missing headers: stdarg.h and varargs.h],
+      [1])
+    ])
+  ])
+
 dnl Check if libfmapi or required headers and functions are available
 AX_LIBFMAPI_CHECK_ENABLE
 

diff --git a/m4/python.m4 b/m4/python.m4
@@ -1,6 +1,6 @@
 dnl Functions for Python bindings
 dnl
-dnl Version: 20170829
+dnl Version: 20170830
 
 dnl Function to check if the python binary is available
 dnl "python${PYTHON_VERSION} python python# python#.#"
@@ -275,6 +275,12 @@ AC_DEFUN([AX_PYTHON2_CHECK],
     AC_MSG_RESULT(
       [$PYTHON2_LDFLAGS])
 
+    dnl For CygWin add the -no-undefined linker flag
+    AS_CASE(
+      [$host_os],
+      [cygwin*],[PYTHON2_LDFLAGS="${PYTHON2_LDFLAGS} -no-undefined"],
+      [*],[])
+
     dnl Check for the existence of Python.h
     BACKUP_CPPFLAGS="${CPPFLAGS}"
     CPPFLAGS="${CPPFLAGS} ${PYTHON2_INCLUDES}"
@@ -380,6 +386,12 @@ AC_DEFUN([AX_PYTHON3_CHECK],
     AC_MSG_RESULT(
       [$PYTHON3_LDFLAGS])
 
+    dnl For CygWin add the -no-undefined linker flag
+    AS_CASE(
+      [$host_os],
+      [cygwin*],[PYTHON3_LDFLAGS="${PYTHON3_LDFLAGS} -no-undefined"],
+      [*],[])
+
     dnl Check for the existence of Python.h
     BACKUP_CPPFLAGS="${CPPFLAGS}"
     CPPFLAGS="${CPPFLAGS} ${PYTHON3_INCLUDES}"
@@ -524,19 +536,6 @@ AC_DEFUN([AX_PYTHON_CHECK_ENABLE],
     [test "x${ac_cv_enable_python3}" != xno],
     [AX_PYTHON3_CHECK])
 
-  AS_IF(
-    [test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno],
-    [dnl Headers included in pycaes/pycaes_error.c
-    AC_CHECK_HEADERS([stdarg.h varargs.h])
-
-    AS_IF(
-      [test "x$ac_cv_header_stdarg_h" != xyes && test "x$ac_cv_header_varargs_h" != xyes],
-      [AC_MSG_FAILURE(
-        [Missing headers: stdarg.h and varargs.h],
-        [1])
-      ])
-    ])
-
   AM_CONDITIONAL(
     HAVE_PYTHON,
     [test "x${ac_cv_enable_python}" != xno])