diff options
| -rw-r--r-- | doc/api/gphoto2-api.sgml | 8 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 19 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port-version.c | 7 | ||||
| -rw-r--r-- | libgphoto2_port/serial/unix.c | 8 |
4 files changed, 6 insertions, 36 deletions
diff --git a/doc/api/gphoto2-api.sgml b/doc/api/gphoto2-api.sgml index 15ac32e0f..26c930920 100644 --- a/doc/api/gphoto2-api.sgml +++ b/doc/api/gphoto2-api.sgml @@ -69,17 +69,11 @@ strongly recommended that you have some library installed that handles locking of serial ports. GPhoto2 currently supports <variablelist> <varlistentry> - <term>baudboy.h</term> - <listitem> - <para>BaudBoy, a library used on Red-Hat systems,</para> - </listitem> - </varlistentry> - <varlistentry> <term>ttylock.h</term> <listitem> <para> ttyLock, a header file provided by several locking libraries - (i.e. BaudBoy and LockDev), and + (i.e. LockDev), and </para> </listitem> </varlistentry> diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 1d8a35854..b3974bb67 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -246,7 +246,6 @@ dnl serial dnl --------------------------------------------------------------------------- serial_msg=yes have_serial=true -try_baudboy_msg=true try_ttylock=true try_lockdev=true try_resmgr=true @@ -257,7 +256,6 @@ AC_ARG_ENABLE([serial], if test x$enableval = xno; then have_serial=false serial_msg=no - try_baudboy=false try_ttylock=false try_lockdev=false try_resmgr=false @@ -275,9 +273,8 @@ if $have_serial; then dnl ----------------------------------------- dnl Serial port locking: We try to use either -dnl (1) baudboy.h -dnl (2) ttylock.h -dnl (3) lockdev.h +dnl (1) ttylock.h +dnl (2) lockdev.h dnl ----------------------------------------- AC_DEFUN([GP_SERLOCK],[dnl # $0([$1]) @@ -290,21 +287,9 @@ AC_ARG_ENABLE([$1], fi ]) ])dnl -GP_SERLOCK([baudboy])dnl GP_SERLOCK([ttylock])dnl GP_SERLOCK([lockdev])dnl -baudboy_msg=no -if $try_baudboy; then - AC_CHECK_HEADER(baudboy.h,[ - baudboy_msg=yes - try_ttylock=false - try_lockdev=false - AC_DEFINE(HAVE_BAUDBOY,1,[Define if you have Baudboy serial locking.]) - ]) -fi -GP_CONFIG_MSG([baudboy locking],[${baudboy_msg}]) - ttylock_msg=no if $try_ttylock; then AC_CHECK_HEADER([lockdev.h]) diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c index ec2cbd5e9..ad1296171 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c @@ -50,8 +50,6 @@ const char **gp_port_library_version(GPVersionVerbosity verbose) #ifdef HAVE_RESMGR "resmgr locking", -#elif HAVE_BAUDBOY - "baudboy locking", #elif HAVE_TTYLOCK "ttylock locking", #elif HAVE_LOCKDEV @@ -95,11 +93,6 @@ const char **gp_port_library_version(GPVersionVerbosity verbose) #else "no resmgr (serial port access and locking)", #endif -#ifdef HAVE_BAUDBOY - "baudboy (serial port locking)", -#else - "no baudboy (serial port locking)", -#endif #ifdef HAVE_TTYLOCK "ttylock (serial port locking)", #else diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 7e0aebb57..77e9eccb9 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -67,9 +67,7 @@ # include <sgtty.h> #endif -#ifdef HAVE_BAUDBOY -# include <baudboy.h> -#elif defined(HAVE_TTYLOCK) +#ifdef HAVE_TTYLOCK # include <ttylock.h> #elif defined(HAVE_LOCKDEV) # include <lockdev.h> @@ -223,7 +221,7 @@ gp_port_serial_lock (GPPort *dev, const char *path) gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", "Trying to lock '%s'...", path); -#if defined(HAVE_TTYLOCK) || defined(HAVE_BAUDBOY) +#if defined(HAVE_TTYLOCK) if (ttylock ((char*) path)) { if (dev) gp_port_set_error (dev, _("Could not lock device " @@ -265,7 +263,7 @@ static int gp_port_serial_unlock (GPPort *dev, const char *path) { -#if defined(HAVE_TTYLOCK) || defined(HAVE_BAUDBOY) +#if defined(HAVE_TTYLOCK) if (ttyunlock ((char*) path)) { if (dev) gp_port_set_error (dev, _("Device '%s' could not be " |