diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-16 18:25:46 +0100 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-17 23:19:41 +0100 |
commit | be9e0a889ad4b6551ae16df3324b2f7ebba0600c (patch) | |
tree | 24066d9baa8fd668ebd194c20a7196d1aac72e64 /.travis-script.sh | |
parent | 7539525efde5bba86052c0678a769cc8b427e0ce (diff) | |
download | libgphoto2-be9e0a889ad4b6551ae16df3324b2f7ebba0600c.tar.gz |
New set based camlib definition and --with-camlibs handling
This uses proper set operations both for GP_CAMLIB and for handling
the --with-camlibs value. This allows all GP_CAMLIB definitions to
be present at autoreconf time (as m4 code) time while some camlib
definitions being conditional at the time of the configure run (in
the sh code).
The ./configure output is still a bit verbose, but we can reduce that
verbosity later when we have found out that this works well on people's
different systems.
Fixes: https://github.com/gphoto/libgphoto2/issues/467
Diffstat (limited to '.travis-script.sh')
-rw-r--r-- | .travis-script.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis-script.sh b/.travis-script.sh index a9bf00c2e..6c9297faa 100644 --- a/.travis-script.sh +++ b/.travis-script.sh @@ -22,8 +22,9 @@ rel_builddir="_build-${buildid}" mkdir "${rel_builddir}" cd "${rel_builddir}" +SLEEP="$(which true)" -if ../configure --prefix="$abs_prefixdir" "$@" +if ../configure SLEEP="$SLEEP" --prefix="$abs_prefixdir" "$@" then echo "Configure successful." else |