Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Apr 30, 2019
1 parent 4902b73 commit aac3b31
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 57 deletions.
17 changes: 13 additions & 4 deletions .travis.yml
Expand Up @@ -189,7 +189,7 @@ matrix:
compiler: gcc
os: osx
osx_image: xcode8.3
- name: "Mac OS gcc and pkgbuild"
- name: "Mac OS gcc and Python module and pkgbuild"
env:
- CONFIGURE_OPTIONS="--disable-dependency-tracking --prefix=/usr/local --enable-python --with-pyprefix"
- TARGET="macos-gcc-pkgbuild"
Expand Down Expand Up @@ -224,9 +224,18 @@ script:
- if test ${TARGET} = "linux-gcc-python-setup-py" || test ${TARGET} = "macos-gcc-python-setup-py"; then
./configure ${CONFIGURE_OPTIONS} && make > /dev/null && python ./setup.py build;
elif test ${TARGET} != "coverity"; then
./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1;
if test $? -ne 0 && test -f tests/test-suite.log; then
cat tests/test-suite.log;
./configure ${CONFIGURE_OPTIONS} && make > /dev/null; RESULT=$?;
if test ${RESULT} -eq 0; then
if test ${TARGET} = "macos-gcc-python" || test ${TARGET} = "macos-gcc-pkgbuild"; then
install_name_tool -change /usr/local/lib/libvslvm.1.dylib ${PWD}/libvslvm/.libs/libvslvm.1.dylib ./pyvslvm/.libs/pyvslvm.so;
fi;
make check CHECK_WITH_STDERR=1; RESULT=$?;
fi;
if test ${RESULT} -ne 0; then
if test -f tests/test-suite.log; then
cat tests/test-suite.log;
fi;
return ${RESULT};
fi;
if test ${TARGET} = "macos-gcc-pkgbuild"; then
VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` &&
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )

AC_INIT(
[libvslvm],
[20190306],
[20190430],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down
7 changes: 4 additions & 3 deletions m4/libbfio.m4
@@ -1,14 +1,15 @@
dnl Checks for libbfio required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libbfio is available
dnl ac_libbfio_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBBFIO_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libbfio" = xno],
[ac_cv_libbfio=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libbfio=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libbfio" != x && test "x$ac_cv_with_libbfio" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBBFIO_CHECK_LIB],
[no such directory: $ac_cv_with_libbfio],
[1])
])
ac_cv_libbfio=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcdata.m4
@@ -1,14 +1,15 @@
dnl Checks for libcdata required headers and functions
dnl
dnl Version: 20190112
dnl Version: 20190308

dnl Function to detect if libcdata is available
dnl ac_libcdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCDATA_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcdata" = xno],
[ac_cv_libcdata=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcdata=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB],
[no such directory: $ac_cv_with_libcdata],
[1])
])
ac_cv_libcdata=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcerror.m4
@@ -1,14 +1,15 @@
dnl Checks for libcerror required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcerror is available
dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCERROR_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcerror" = xno],
[ac_cv_libcerror=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcerror=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB],
[no such directory: $ac_cv_with_libcerror],
[1])
])
ac_cv_libcerror=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcfile.m4
@@ -1,14 +1,15 @@
dnl Checks for libcfile required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcfile is available
dnl ac_libcfile_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCFILE_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcfile" = xno],
[ac_cv_libcfile=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcfile=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcfile" != x && test "x$ac_cv_with_libcfile" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCFILE_CHECK_LIB],
[no such directory: $ac_cv_with_libcfile],
[1])
])
ac_cv_libcfile=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libclocale.m4
@@ -1,14 +1,15 @@
dnl Checks for libclocale required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libclocale is available
dnl ac_libclocale_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libclocale" = xno],
[ac_cv_libclocale=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libclocale=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libclocale" != x && test "x$ac_cv_with_libclocale" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB],
[no such directory: $ac_cv_with_libclocale],
[1])
])
ac_cv_libclocale=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcnotify.m4
@@ -1,14 +1,15 @@
dnl Checks for libcnotify required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcnotify is available
dnl ac_libcnotify_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcnotify" = xno],
[ac_cv_libcnotify=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcnotify=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB],
[no such directory: $ac_cv_with_libcnotify],
[1])
])
ac_cv_libcnotify=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcpath.m4
@@ -1,14 +1,15 @@
dnl Checks for libcpath required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcpath is available
dnl ac_libcpath_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCPATH_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcpath" = xno],
[ac_cv_libcpath=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcpath=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcpath" != x && test "x$ac_cv_with_libcpath" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB],
[no such directory: $ac_cv_with_libcpath],
[1])
])
ac_cv_libcpath=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcsplit.m4
@@ -1,14 +1,15 @@
dnl Checks for libcsplit required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcsplit is available
dnl ac_libcsplit_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCSPLIT_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcsplit" = xno],
[ac_cv_libcsplit=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcsplit=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcsplit" != x && test "x$ac_cv_with_libcsplit" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCSPLIT_CHECK_LIB],
[no such directory: $ac_cv_with_libcsplit],
[1])
])
ac_cv_libcsplit=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libcthreads.m4
@@ -1,14 +1,15 @@
dnl Checks for libcthreads required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libcthreads is available
dnl ac_libcthreads_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcthreads" = xno],
[ac_cv_libcthreads=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libcthreads=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB],
[no such directory: $ac_cv_with_libcthreads],
[1])
])
ac_cv_libcthreads=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libfcache.m4
@@ -1,14 +1,15 @@
dnl Checks for libfcache required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libfcache is available
dnl ac_libfcache_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBFCACHE_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfcache" = xno],
[ac_cv_libfcache=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libfcache=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libfcache" != x && test "x$ac_cv_with_libfcache" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFCACHE_CHECK_LIB],
[no such directory: $ac_cv_with_libfcache],
[1])
])
ac_cv_libfcache=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libfdata.m4
@@ -1,14 +1,15 @@
dnl Functions for libfdata
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libfdata is available
dnl ac_libfdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBFDATA_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfdata" = xno],
[ac_cv_libfdata=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libfdata=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libfdata" != x && test "x$ac_cv_with_libfdata" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB],
[no such directory: $ac_cv_with_libfdata],
[1])
])
ac_cv_libfdata=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libfvalue.m4
@@ -1,14 +1,15 @@
dnl Checks for libfvalue required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libfvalue is available
dnl ac_libfvalue_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBFVALUE_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfvalue" = xno],
[ac_cv_libfvalue=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libfvalue=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libfvalue" != x && test "x$ac_cv_with_libfvalue" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFVALUE_CHECK_LIB],
[no such directory: $ac_cv_with_libfvalue],
[1])
])
ac_cv_libfvalue=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down
7 changes: 4 additions & 3 deletions m4/libuna.m4
@@ -1,14 +1,15 @@
dnl Checks for libuna or required headers and functions
dnl
dnl Version: 20181117
dnl Version: 20190308

dnl Function to detect if libuna is available
dnl ac_libuna_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
AC_DEFUN([AX_LIBUNA_CHECK_LIB],
[AS_IF(
[test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libuna" = xno],
[ac_cv_libuna=no],
[dnl Check if the directory provided as parameter exists
[ac_cv_libuna=check
dnl Check if the directory provided as parameter exists
AS_IF(
[test "x$ac_cv_with_libuna" != x && test "x$ac_cv_with_libuna" != xauto-detect],
[AS_IF(
Expand All @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBUNA_CHECK_LIB],
[no such directory: $ac_cv_with_libuna],
[1])
])
ac_cv_libuna=check],
],
[dnl Check for a pkg-config file
AS_IF(
[test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
Expand Down

0 comments on commit aac3b31

Please sign in to comment.