Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9485
Modified Files:
Tag: release-2-0-patches
acinclude.m4 configure.ac
Log Message:
merged many changes from HEAD
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.80.2.6
retrieving revision 1.80.2.7
diff -C2 -d -r1.80.2.6 -r1.80.2.7
*** acinclude.m4 5 Jul 2006 23:30:33 -0000 1.80.2.6
--- acinclude.m4 22 Sep 2006 23:58:34 -0000 1.80.2.7
***************
*** 301,304 ****
--- 301,306 ----
fi
+ PLAYER_ADD_DRIVER([sicknav200],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([sickpls],[yes],[],[],[])
if test "x$enable_sickpls" = "xyes"; then
***************
*** 306,309 ****
--- 308,316 ----
fi
+ PLAYER_ADD_DRIVER([sicks3000],[yes],[],[],[])
+ if test "x$enable_sicks3000" = "xyes"; then
+ AC_CHECK_HEADERS(linux/serial.h, [], [], [])
+ fi
+
AC_ARG_ENABLE(highspeedsick, [ --disable-highspeedsick Don't build support
for 500Kbps comms with SICK],,enable_highspeedsick=yes)
if test "x$enable_highspeedsick" = "xno"; then
Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/player/configure.ac,v
retrieving revision 1.60.2.7
retrieving revision 1.60.2.8
diff -C2 -d -r1.60.2.7 -r1.60.2.8
*** configure.ac 5 Jul 2006 22:42:22 -0000 1.60.2.7
--- configure.ac 22 Sep 2006 23:58:34 -0000 1.60.2.8
***************
*** 3,10 ****
dnl Initialize autoconf with name and version of package to be built.
dnl PACKAGE and VERSION will be so defined in <config.h>.
! AC_INIT(player,2.0.2)
dnl this is used by libtool to assign version numbers
! PLAYER_VERSION_INFO="-version-number 2:0:2"
AC_SUBST(PLAYER_VERSION_INFO)
--- 3,10 ----
dnl Initialize autoconf with name and version of package to be built.
dnl PACKAGE and VERSION will be so defined in <config.h>.
! AC_INIT(player,2.0.3)
dnl this is used by libtool to assign version numbers
! PLAYER_VERSION_INFO="-version-number 2:0:3"
AC_SUBST(PLAYER_VERSION_INFO)
***************
*** 537,540 ****
--- 537,541 ----
server/drivers/position/bumpersafe/Makefile
server/drivers/position/lasersafe/Makefile
+ server/drivers/position/nav200/Makefile
server/drivers/mcom/Makefile
server/drivers/localization/Makefile
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
