diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-17 06:38:06 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-17 06:38:06 +0100 |
| commit | 2dfe9d288a9b13f9d41602e01826c1434c57c528 (patch) | |
| tree | 736c22ea2771259b6e00291c2f5a5fcebf55d5aa | |
| parent | 575eb04a2de5ee1c58149e2f4665b40630561943 (diff) | |
| download | libgphoto2-2dfe9d288a9b13f9d41602e01826c1434c57c528.tar.gz | |
Allow setting SLEEP to /bin/true to accelerate configure run
| -rw-r--r-- | .travis-script.sh | 8 | ||||
| -rw-r--r-- | gphoto-m4/gp-camlibs.m4 | 8 | ||||
| -rw-r--r-- | gphoto-m4/gp-progs.m4 | 10 |
3 files changed, 19 insertions, 7 deletions
diff --git a/.travis-script.sh b/.travis-script.sh index c3a95daa8..96f92c85d 100644 --- a/.travis-script.sh +++ b/.travis-script.sh @@ -7,7 +7,7 @@ ls -l configure shift -properdir="$(pwd)" +abs_topsrcdir="$(pwd)" mkdir "_build-${buildid}" @@ -16,7 +16,9 @@ set -x cd "_build-${buildid}" -if ../configure --prefix="$(cd ".." && pwd)/_root-${buildid}" "$@" +abs_prefixdir="${abs_topsrcdir}/_root-${buildid}" + +if ../configure SLEEP=/bin/true --prefix="$abs_prefixdir" "$@" then echo "Configure successful." else @@ -52,7 +54,7 @@ make install examples/sample-afl -cd "$properdir" +cd "$abs_topsrcdir" find "_root-${buildid}" -type f | sort diff --git a/gphoto-m4/gp-camlibs.m4 b/gphoto-m4/gp-camlibs.m4 index d19a5d5c2..2706677f5 100644 --- a/gphoto-m4/gp-camlibs.m4 +++ b/gphoto-m4/gp-camlibs.m4 @@ -157,7 +157,7 @@ AC_MSG_WARN([ # * or even better, just build the standard set of camlibs. # #=====================================================================# ]) -sleep 5 +${SLEEP} 5 ]) dnl dnl @@ -240,7 +240,7 @@ AS_VAR_IF([gp_sh_with_camlibs], [canon], [dnl # Autoselecting the 'ptp2' driver in addition to the 'canon' # # driver to prevent unnecessary support requests. # #==============================================================# - sleep 5 + ${SLEEP} 5 ])])dnl dnl set -x @@ -300,7 +300,7 @@ do # 'standard' instead. # #=============================================================# ]) - sleep 5 + ${SLEEP} 5 gp_camlib="standard" ;; esac @@ -430,7 +430,7 @@ AS_IF([test "x$gp_camlib_set_skipping" = "x"], [dnl # you insist on building these camlibs. # #=========================================================# ]) - sleep 5 + ${SLEEP} 5 ]) GP_SET_SPACE_VAR([camlib-set], [gp_camlib_set]) diff --git a/gphoto-m4/gp-progs.m4 b/gphoto-m4/gp-progs.m4 index ec8fbad93..90f239097 100644 --- a/gphoto-m4/gp-progs.m4 +++ b/gphoto-m4/gp-progs.m4 @@ -62,6 +62,16 @@ dnl dnl #################################################################### dnl dnl #################################################################### +m4_pattern_forbid([GP_PROG_SLEEP])dnl +AC_DEFUN_ONCE([GP_PROG_SLEEP],[dnl +AC_ARG_VAR([SLEEP], [sleep delay command])dnl +AC_PATH_PROG([SLEEP], [sleep])dnl +])dnl +dnl +dnl +dnl #################################################################### +dnl +dnl #################################################################### m4_pattern_forbid([GP_PROG_SORT])dnl AC_DEFUN_ONCE([GP_PROG_SORT],[dnl AC_ARG_VAR([SORT], [sort text file line sorting command])dnl |