diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-16 22:07:33 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-16 22:07:33 +0100 |
| commit | bc112e66d78f9899ae35e44c326406ba37092802 (patch) | |
| tree | 5aa33cec05c5d6f8b1d7112991cdefedf17271d6 | |
| parent | 283b920ee87a6d726fabcfe09171ae6f353423da (diff) | |
| download | libgphoto2-bc112e66d78f9899ae35e44c326406ba37092802.tar.gz | |
travis-ci: if configure fails, cat config.log
Remove "set -x", though. That is too verbose, and appears to confuse
configure.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index b85482bba..707d2a914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,9 @@ compiler: - gcc script: - - PATH=/usr/local/opt/gettext/bin:$PATH autoreconf -i -f + - PATH=/usr/local/opt/gettext/bin:$PATH autoreconf -i -f && sleep 2 - date; ls -l configure - - mkdir _b && (cd _b && ../configure --prefix=$PWD/../_i --enable-vusb --with-camlibs=everything && make -j2 && if make check; then :; else cat libgphoto2_port/test/test-suite.log test/test-suite.log; false; fi && make install && examples/sample-afl ) && find _i -type f | sort + - mkdir _b && (cd _b && if ../configure --prefix=$PWD/../_i --enable-vusb --with-camlibs=everything; then :; else cat config.log; false; fi && make -j2 && if make check; then :; else cat libgphoto2_port/test/test-suite.log test/test-suite.log; false; fi && make install && examples/sample-afl ) && find _i -type f | sort - date; ls -l configure - ./configure --enable-vusb && make && if make check; then :; else cat libgphoto2_port/test/test-suite.log test/test-suite.log; false; fi && sudo PATH=$PATH make install && examples/sample-afl && make clean - date; ls -l configure diff --git a/configure.ac b/configure.ac index 4de6e2c13..f03e8fa8a 100644 --- a/configure.ac +++ b/configure.ac @@ -605,7 +605,6 @@ dnl --------------------------------------------------------------------------- AC_MSG_CHECKING([checkpoint G]) AC_MSG_RESULT([apparently]) -set -x GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13], [libexif/exif-data.h],[exif_data_new],[ @@ -647,7 +646,6 @@ CPPFLAGS="$CPPFLAGS_save" AC_MSG_RESULT([apparently]) ],[default-on],[http://www.sourceforge.net/projects/libexif])dnl -set +x dnl FIXME: Is this accurate? AM_CONDITIONAL([HAVE_CXX], [test -n "$CXX" && test "X$CXX" != "Xno"]) |