From be9e0a889ad4b6551ae16df3324b2f7ebba0600c Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 16 Feb 2020 18:25:46 +0100 Subject: 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 --- .travis-script.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis-script.sh') 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 -- cgit v1.2.1