summaryrefslogtreecommitdiff
path: root/gphoto-m4
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-03 21:16:06 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-03 21:18:55 +0100
commitb57d5fdb579da0d330a6890f5e407417ec936567 (patch)
treec40d100301ecd103d22687fab799d8ec9e7aebf9 /gphoto-m4
parent49b4fda207a9e6a0689a43ecd5e1aa86f1f4b4b8 (diff)
downloadlibgphoto2-b57d5fdb579da0d330a6890f5e407417ec936567.tar.gz
gp-camlibs.m4: Fix GP_SLEEP invocation in in Gentoo hack
Fix the GP_SLEEP invocation in the Gentoo hack warning which adds the ptp2 camlib if the only camlib requested is canon, as modern Canon cameras use the ptp2 camlib, not the canon camlib. Also syncs gphoto-m4/gp-camlibs.m4 to libgphoto2-port/gphoto-m4/.
Diffstat (limited to 'gphoto-m4')
-rw-r--r--gphoto-m4/gp-camlibs.m45
1 files changed, 3 insertions, 2 deletions
diff --git a/gphoto-m4/gp-camlibs.m4 b/gphoto-m4/gp-camlibs.m4
index a6b14ac18..e472f77ea 100644
--- a/gphoto-m4/gp-camlibs.m4
+++ b/gphoto-m4/gp-camlibs.m4
@@ -240,8 +240,9 @@ AS_VAR_IF([gp_sh_with_camlibs], [canon], [dnl
# Autoselecting the 'ptp2' driver in addition to the 'canon' #
# driver to prevent unnecessary support requests. #
#==============================================================#
- GP_SLEEP([5])
-])])dnl
+])
+ GP_SLEEP([5])
+])dnl
dnl set -x