Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4151
Modified Files:
acinclude.m4
Log Message:
made acinclude driver list alphabetical again
added tcpstream driver
bug fixes for s3000 and nav200 drivers
made point features more visible in playerv vector map display
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** acinclude.m4 11 Dec 2007 18:48:08 -0000 1.149
--- acinclude.m4 18 Dec 2007 05:05:08 -0000 1.150
***************
*** 117,120 ****
--- 117,121 ----
+ PLAYER_ADD_DRIVER([accel_calib],[yes],[],[],[])
PLAYER_ADD_DRIVER([acts],[yes],[],[],[])
***************
*** 129,145 ****
PLAYER_ADD_DRIVER([amcl], [yes],[gsl/gsl_version.h],[],["-lgsl -lgslcblas"])
! PLAYER_ADD_DRIVER([amtecpowercube],[yes],[],[],[])
!
PLAYER_ADD_DRIVER([artoolkitplus],[yes],[],[],[],[ARTOOLKITPLUS],[artoolkitplus
>= 2.1])
! PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $ARTOOLKITPLUS_LIBS"
PLAYER_ADD_DRIVER([aodv],[yes],[],[],[])
! PLAYER_ADD_DRIVER([localbb],[yes],[],[],[])
PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
- PLAYER_ADD_DRIVER([nd],[yes],[],[],[])
-
dnl Check to see if we have version 1 or 2 API for dc1394
AC_CHECK_HEADER(dc1394/control.h,[PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
dc1394/control.h"],[],["-lraw1394 -ldc1394"])],
--- 130,166 ----
PLAYER_ADD_DRIVER([amcl], [yes],[gsl/gsl_version.h],[],["-lgsl -lgslcblas"])
! dnl Where's AMTECM5?
! AC_ARG_WITH(amtecM5, [ --with-amtecM5=dir Location of the AMTEC M5
headers and libraries],
! AMTECM5_DIR=$with_amtecM5,AMTECM5_DIR=NONE)
! if test "x$AMTECM5_DIR" = "xNONE" -o "x$AMTECM5_DIR" = "xno"; then
! AMTECM5_HEADER="Device.h"
! AMTECM5_EXTRA_CPPFLAGS=
! AMTECM5_EXTRA_LDFLAGS="device.a ntcan.a util.a"
! else
! AMTECM5_HEADER="$AMTECM5_DIR/Device/Device.h"
! AMTECM5_EXTRA_CPPFLAGS="-I$AMTECM5_DIR/include -I$AMTECM5_DIR/Device"
! AMTECM5_EXTRA_LDFLAGS="$AMTECM5_DIR/lib/device.a
$AMTECM5_DIR/lib/libntcan.a $AMTECM5_DIR/lib/util.a"
! fi
! AC_LANG_PUSH(C++)
! PLAYER_ADD_DRIVER([amtecM5],[yes],
! [$AMTECM5_HEADER], [$AMTECM5_EXTRA_CPPFLAGS],
! [$AMTECM5_EXTRA_LDFLAGS], [], [],
! [[
! #define __LINUX__
! #define UNIX
! #define LINUX
! ]])
! AC_LANG_POP(C++)
!
! PLAYER_ADD_DRIVER([amtecpowercube],[yes],[],[],[])
PLAYER_ADD_DRIVER([aodv],[yes],[],[],[])
!
PLAYER_ADD_DRIVER([artoolkitplus],[yes],[],[],[],[ARTOOLKITPLUS],[artoolkitplus
>= 2.1])
! PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $ARTOOLKITPLUS_LIBS"
PLAYER_ADD_DRIVER([bumpersafe],[yes],[],[],[])
dnl Check to see if we have version 1 or 2 API for dc1394
AC_CHECK_HEADER(dc1394/control.h,[PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
dc1394/control.h"],[],["-lraw1394 -ldc1394"])],
***************
*** 185,192 ****
--- 206,217 ----
PLAYER_ADD_DRIVER([cmvision],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([create],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([dummy],[yes],[],[],[])
PLAYER_ADD_DRIVER([er1],[yes],[asm/ioctls.h],[],[])
+ PLAYER_ADD_DRIVER([erratic],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([fakelocalize], [yes],[],[],[])
***************
*** 204,207 ****
--- 229,234 ----
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
+ PLAYER_ADD_DRIVER([insideM300],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([isense],[yes],[isense/isense.h],
[],["-lisense"])
***************
*** 209,212 ****
--- 236,241 ----
PLAYER_ADD_DRIVER([iwspy],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([kartowriter],[no],[],[],[])
+
PLAYER_ADD_DRIVER([khepera],[yes],[],[],[])
***************
*** 217,231 ****
PLAYER_ADD_DRIVER([lasercspace],[yes],[],[],[])
PLAYER_ADD_DRIVER([laserposeinterpolator],[yes],[],[],[])
PLAYER_ADD_DRIVER([laserrescan],[yes],[],[],[])
- PLAYER_ADD_DRIVER([lasercutter],[yes],[],[],[])
PLAYER_ADD_DRIVER([lasersafe],[yes],[],[],[])
PLAYER_ADD_DRIVER([laservisualbarcode],[yes],[],[],[])
PLAYER_ADD_DRIVER([laservisualbw],[yes],[],[],[])
PLAYER_ADD_DRIVER([linuxjoystick],[yes],[linux/joystick.h],[],[])
--- 246,267 ----
PLAYER_ADD_DRIVER([lasercspace],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([lasercutter],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([laserposeinterpolator],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([laserptzcloud],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([laserrescan],[yes],[],[],[])
PLAYER_ADD_DRIVER([lasersafe],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([lasertoranger],[no],[],[],[])
+
PLAYER_ADD_DRIVER([laservisualbarcode],[yes],[],[],[])
PLAYER_ADD_DRIVER([laservisualbw],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([lifomcom],[no],[],[],[])
+
PLAYER_ADD_DRIVER([linuxjoystick],[yes],[linux/joystick.h],[],[])
***************
*** 233,239 ****
[],[],[],[],[[#include <netinet/in.h>]])
! PLAYER_ADD_DRIVER([lifomcom],[no],[],[],[])
!
! PLAYER_ADD_DRIVER([laserposeinterpolator],[yes],[],[],[])
PLAYER_ADD_DRIVER([logfile],[yes],[],[],[])
--- 269,273 ----
[],[],[],[],[[#include <netinet/in.h>]])
! PLAYER_ADD_DRIVER([localbb],[yes],[],[],[])
PLAYER_ADD_DRIVER([logfile],[yes],[],[],[])
***************
*** 248,251 ****
--- 282,289 ----
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $GDK_PIXBUF_LIBS"
+ PLAYER_ADD_DRIVER([mbicp],[yes],)
+
+ PLAYER_ADD_DRIVER([mica2],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([microstrain],[yes],[],[],[])
***************
*** 255,271 ****
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $MRICP_LIBS"
! PLAYER_ADD_DRIVER([nomad],[no],[],[],[])
PLAYER_ADD_DRIVER([nimu],[yes],[usb.h],[],[-lusb])
PLAYER_ADD_DRIVER([obot],[yes],[],[],[])
PLAYER_ADD_DRIVER([p2os],[yes],[],[],[])
! PLAYER_ADD_DRIVER([erratic],[yes],[],[],[])
! PLAYER_ADD_DRIVER([wbr914],[yes],[linux/serial.h],[],[])
! PLAYER_ADD_DRIVER([passthrough],[yes],[],[],[])
PLAYER_ADD_DRIVER([postgis],[yes],[],[],["-lgeos"],[LIBPQXX],[libpqxx])
--- 293,328 ----
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $MRICP_LIBS"
! PLAYER_ADD_DRIVER([nd],[yes],[],[],[])
PLAYER_ADD_DRIVER([nimu],[yes],[usb.h],[],[-lusb])
+ PLAYER_ADD_DRIVER([nomad],[no],[],[],[])
+
PLAYER_ADD_DRIVER([obot],[yes],[],[],[])
PLAYER_ADD_DRIVER([p2os],[yes],[],[],[])
! PLAYER_ADD_DRIVER([passthrough],[yes],[],[],[])
! dnl Where's libphidget?
! AC_ARG_WITH(phidgetRFID, [ --with-libphidget=dir Location of the
Phidget (from www.phidgets.com) headers and libraries],
! LIBPHIDGET_DIR=$with_libphidget,LIBPHIDGET_DIR=NONE)
! if test "x$LIBPHIDGET_DIR" = "xNONE" -o "x$LIBPHIDGET_DIR" = "xno"; then
! LIBPHIDGET_HEADER="phidget21.h"
! LIBPHIDGET_EXTRA_CPPFLAGS=
! LIBPHIDGET_EXTRA_LDFLAGS="-lphidget21"
! else
! LIBPHIDGET_HEADER="$LIBPHIDGET_DIR/phidget21.h"
! LIBPHIDGET_EXTRA_CPPFLAGS="-I$LIBPHIDGET_DIR/include"
! LIBPHIDGET_EXTRA_LDFLAGS="-L$LIBPHIDGET_DIR/lib -lphidget21"
! fi
! PLAYER_ADD_DRIVER([phidgetRFID],[yes],
! [$LIBPHIDGET_HEADER], [$LIBPHIDGET_EXTRA_CPPFLAGS],
! [$LIBPHIDGET_EXTRA_LDFLAGS])
!
! PLAYER_ADD_DRIVER([phidgetIFK],[yes],
! [$LIBPHIDGET_HEADER], [$LIBPHIDGET_EXTRA_CPPFLAGS],
! [$LIBPHIDGET_EXTRA_LDFLAGS])
PLAYER_ADD_DRIVER([postgis],[yes],[],[],["-lgeos"],[LIBPQXX],[libpqxx])
***************
*** 276,285 ****
PLAYER_ADD_DRIVER([ptu46],[yes],[],[],[])
PLAYER_ADD_DRIVER([reb],[no],[],[],[])
PLAYER_ADD_DRIVER([relay],[yes],[],[],[])
- PLAYER_ADD_DRIVER([kartowriter],[no],[],[],[])
-
PLAYER_ADD_DRIVER([rflex],[yes],[],[],[])
--- 333,342 ----
PLAYER_ADD_DRIVER([ptu46],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([rcore_xbridge],[yes],[libparticle.h],[],["-lparticle"])
+
PLAYER_ADD_DRIVER([reb],[no],[],[],[])
PLAYER_ADD_DRIVER([relay],[yes],[],[],[])
PLAYER_ADD_DRIVER([rflex],[yes],[],[],[])
***************
*** 288,291 ****
--- 345,352 ----
PLAYER_ADD_DRIVER([robotino],[yes],["robotinocom.h xtimer.h
xthread.h"],[],["-lxtimer -lrobotinocom -lxthread -lpthread"])
+ PLAYER_ADD_DRIVER([roomba],[yes],[],[],[])
+
+ PLAYER_ADD_DRIVER([rs4leuze],[yes],[],[],[])
+
dnl Where's CANLIB?
AC_ARG_WITH(canlib, [ --with-canlib=dir Location of CANLIB],
***************
*** 305,332 ****
[$SEGWAYRMP_EXTRA_LDFLAGS])
- dnl Where's AMTECM5?
- AC_ARG_WITH(amtecM5, [ --with-amtecM5=dir Location of the AMTEC M5
headers and libraries],
- AMTECM5_DIR=$with_amtecM5,AMTECM5_DIR=NONE)
- if test "x$AMTECM5_DIR" = "xNONE" -o "x$AMTECM5_DIR" = "xno"; then
- AMTECM5_HEADER="Device.h"
- AMTECM5_EXTRA_CPPFLAGS=
- AMTECM5_EXTRA_LDFLAGS="device.a ntcan.a util.a"
- else
- AMTECM5_HEADER="$AMTECM5_DIR/Device/Device.h"
- AMTECM5_EXTRA_CPPFLAGS="-I$AMTECM5_DIR/include -I$AMTECM5_DIR/Device"
- AMTECM5_EXTRA_LDFLAGS="$AMTECM5_DIR/lib/device.a
$AMTECM5_DIR/lib/libntcan.a $AMTECM5_DIR/lib/util.a"
- fi
-
- AC_LANG_PUSH(C++)
- PLAYER_ADD_DRIVER([amtecM5],[yes],
- [$AMTECM5_HEADER], [$AMTECM5_EXTRA_CPPFLAGS],
- [$AMTECM5_EXTRA_LDFLAGS], [], [],
- [[
- #define __LINUX__
- #define UNIX
- #define LINUX
- ]])
- AC_LANG_POP(C++)
-
PLAYER_ADD_DRIVER([serialstream],[yes],[],[],[])
--- 366,369 ----
***************
*** 353,356 ****
--- 390,395 ----
fi
+ PLAYER_ADD_DRIVER([sickrfi341],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([sicks3000],[yes],[],[],[])
if test "x$enable_sicks3000" = "xyes"; then
***************
*** 367,370 ****
--- 406,411 ----
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS $OPENCV_LIBS"
+ PLAYER_ADD_DRIVER([skyetekM1],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([sphere],[yes],[linux/videodev.h],[],[])
***************
*** 372,381 ****
--- 413,428 ----
[],["-lsphinx2 -lsphinx2fe -lsphinx2ad"])
+ PLAYER_ADD_DRIVER([sonartoranger],[no],[],[],[])
+
PLAYER_ADD_DRIVER([sonyevid30],[yes],[],[],[])
+ PLAYER_ADD_DRIVER([sr3000],[yes],[libusbSR.h],[],["-lusbSR"])
+
PLAYER_ADD_DRIVER([statgrab],[yes],
[],[],[],[STATGRAB],[libstatgrab])
PLAYER_DRIVER_EXTRA_LIBS="$PLAYER_DRIVER_EXTRA_LIBS
$STATGRAB_LIBS"
+ PLAYER_ADD_DRIVER([tcpstream],[yes],[],[],[])
+
PLAYER_ADD_DRIVER([upcbarcode],[yes],[],[],[],
[OPENCV],[opencv])
***************
*** 387,403 ****
fi
- PLAYER_ADD_DRIVER([rs4leuze],[yes],[],[],[])
-
PLAYER_ADD_DRIVER([vfh],[yes],)
- PLAYER_ADD_DRIVER([mbicp],[yes],)
-
PLAYER_ADD_DRIVER([vmapfile],[yes],[],[],[])
! PLAYER_ADD_DRIVER([roomba],[yes],[],[],[])
! PLAYER_ADD_DRIVER([create],[yes],[],[],[])
! PLAYER_ADD_DRIVER([wavefront],[yes],[],[],[])
save_ac_ext=$ac_ext
--- 434,446 ----
fi
PLAYER_ADD_DRIVER([vfh],[yes],)
PLAYER_ADD_DRIVER([vmapfile],[yes],[],[],[])
! PLAYER_ADD_DRIVER([wavefront],[yes],[],[],[])
! PLAYER_ADD_DRIVER([wbr914],[yes],[linux/serial.h],[],[])
! PLAYER_ADD_DRIVER([xsensmt],[yes],[],[],[])
save_ac_ext=$ac_ext
***************
*** 406,451 ****
ac_ext=$save_ac_ext
- dnl RFID support
- PLAYER_ADD_DRIVER([insideM300],[yes],[],[],[])
- PLAYER_ADD_DRIVER([skyetekM1],[yes],[],[],[])
- PLAYER_ADD_DRIVER([sickrfi341],[yes],[],[],[])
- dnl Where's libphidget?
- AC_ARG_WITH(phidgetRFID, [ --with-libphidget=dir Location of the
Phidget (from www.phidgets.com) headers and libraries],
- LIBPHIDGET_DIR=$with_libphidget,LIBPHIDGET_DIR=NONE)
- if test "x$LIBPHIDGET_DIR" = "xNONE" -o "x$LIBPHIDGET_DIR" = "xno"; then
- LIBPHIDGET_HEADER="phidget21.h"
- LIBPHIDGET_EXTRA_CPPFLAGS=
- LIBPHIDGET_EXTRA_LDFLAGS="-lphidget21"
- else
- LIBPHIDGET_HEADER="$LIBPHIDGET_DIR/phidget21.h"
- LIBPHIDGET_EXTRA_CPPFLAGS="-I$LIBPHIDGET_DIR/include"
- LIBPHIDGET_EXTRA_LDFLAGS="-L$LIBPHIDGET_DIR/lib -lphidget21"
- fi
- PLAYER_ADD_DRIVER([phidgetRFID],[yes],
- [$LIBPHIDGET_HEADER], [$LIBPHIDGET_EXTRA_CPPFLAGS],
- [$LIBPHIDGET_EXTRA_LDFLAGS])
- PLAYER_ADD_DRIVER([phidgetIFK],[yes],
- [$LIBPHIDGET_HEADER], [$LIBPHIDGET_EXTRA_CPPFLAGS],
- [$LIBPHIDGET_EXTRA_LDFLAGS])
- dnl WSN support
- PLAYER_ADD_DRIVER([mica2],[yes],[],[],[])
- PLAYER_ADD_DRIVER([rcore_xbridge],[yes],[libparticle.h],[],["-lparticle"])
- PLAYER_ADD_DRIVER([accel_calib],[yes],[],[],[])
-
- dnl IMU support
- PLAYER_ADD_DRIVER([xsensmt],[yes],[],[],[])
-
- dnl POINTCLOUD3D support
- PLAYER_ADD_DRIVER([laserptzcloud],[yes],[],[],[])
- PLAYER_ADD_DRIVER([sr3000],[yes],[libusbSR.h],[],["-lusbSR"])
-
- dnl Ranger support
- PLAYER_ADD_DRIVER([lasertoranger],[no],[],[],[])
- PLAYER_ADD_DRIVER([sonartoranger],[no],[],[],[])
dnl The wavefront driver can make use of MD5 hash functions, if present
--- 449,457 ----
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
