From e29e308e15ee6527b11cd8600a88e9ea8f11752b Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 10 Dec 2002 13:40:04 +0000 Subject: [PATCH] resmgr does serial port locking, so it doesn't make sense to be used concurrently with baudboy, ttylock or lockdev git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5937 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/libgphoto2_port/gphoto2-port-version.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c index 43a67f644..0893363a5 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c @@ -42,10 +42,10 @@ const char **gp_port_library_version(GPVersionVerbosity verbose) #endif #ifdef HAVE_SERIAL "serial " + #ifdef HAVE_RESMGR "resmgr locking", -#endif -#ifdef HAVE_BAUDBOY +#elif HAVE_BAUDBOY "baudboy locking", #elif HAVE_TTYLOCK "ttylock locking", @@ -54,6 +54,7 @@ const char **gp_port_library_version(GPVersionVerbosity verbose) #else "without locking", #endif + #else "no serial", #endif