From: Hans U. N. <hu...@us...> - 2005-04-16 00:37:44
|
Update of /cvsroot/gphoto/libgphoto2/libgphoto2_port In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24813 Modified Files: configure.in Log Message: cosmetics, and removed redundant output of 'unknown' Index: configure.in =================================================================== RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2_port/configure.in,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- configure.in 15 Apr 2005 21:53:44 -0000 1.89 +++ configure.in 16 Apr 2005 00:37:01 -0000 1.90 @@ -212,63 +212,58 @@ resmgr_msg=no if $try_resmgr; then - AC_CHECK_HEADER(resmgr.h, + AC_CHECK_HEADER(resmgr.h,[ AC_CHECK_LIB(resmgr, rsm_lock_device,[ resmgr_msg=yes SERIAL_LIBS="-lresmgr" AC_DEFINE(HAVE_RESMGR,1,[Define if we have the resmgr library.]) ]) - ) + ]) fi GP_CONFIG_MSG([resmgr locking],[${resmgr_msg}]) baudboy_msg=no if $try_baudboy; then - AC_CHECK_HEADER(baudboy.h, + 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(ttylock.h, + AC_CHECK_HEADER(ttylock.h,[ AC_MSG_CHECKING(if ttylock needs lockdev) - AC_TRY_LINK([#include <ttylock.h>],[ttylocked ("/dev/foo");], + AC_TRY_LINK([#include <ttylock.h>],[ttylocked ("/dev/foo");],[ AC_MSG_RESULT(no) AC_DEFINE(HAVE_TTYLOCK,1,[Define if you have ttylock based tty locking.]) ttylock_msg=yes try_lockdev=false, LDFLAGS="$LDFLAGS -llockdev" - AC_TRY_LINK([#include <ttylock.h>],[ttylocked ("/dev/foo");], + AC_TRY_LINK([#include <ttylock.h>],[ttylocked ("/dev/foo");],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_TTYLOCK,1,[Define if you have ttylock based tty locking.]) ttylock_msg=yes try_lockdev=false SERIAL_LIBS=-llockdev - AC_MSG_RESULT(unknown) - AC_MSG_RESULT(unknown) - ) - AC_MSG_RESULT(unknown) - ) - ) + ]) + ]) + ]) fi GP_CONFIG_MSG([ttylock locking],[${ttylock_msg}]) lockdev_msg=no if $try_lockdev; then AC_CHECK_LIB(lockdev, dev_lock,[ - AC_CHECK_HEADER(lockdev.h,[ - AC_DEFINE(HAVE_LOCKDEV,1,[Define if you have dev_lock/lockdev based locking.]) - lockdev_msg=yes - SERIAL_LIBS=-llockdev - ] - ) - ] - ) + AC_CHECK_HEADER(lockdev.h,[ + AC_DEFINE(HAVE_LOCKDEV,1,[Define if you have dev_lock/lockdev based locking.]) + lockdev_msg=yes + SERIAL_LIBS=-llockdev + ]) + ]) fi GP_CONFIG_MSG([lockdev locking],[${lockdev_msg}]) @@ -276,6 +271,7 @@ AC_SUBST([SERIAL_LIBS]) + dnl --------------------------------------------------------------------------- dnl libusb dnl --------------------------------------------------------------------------- |