Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13867
Modified Files:
acinclude.m4 configure.ac
Log Message:
applied patch [ 1721461 ] Add dependencies for libraries
Dont have the hardware to test this, but compiles when libs are not detected
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** acinclude.m4 20 May 2007 00:30:14 -0000 1.134
--- acinclude.m4 9 Jun 2007 04:08:51 -0000 1.135
***************
*** 392,395 ****
--- 392,417 ----
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],[],[],[])
Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/player/configure.ac,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** configure.ac 9 Jun 2007 03:49:20 -0000 1.96
--- configure.ac 9 Jun 2007 04:08:51 -0000 1.97
***************
*** 500,503 ****
--- 500,504 ----
server/drivers/shell/Makefile
server/drivers/mixed/Makefile
+ server/drivers/mixed/phidgetIFK/Makefile
server/drivers/mixed/wbr/Makefile
server/drivers/mixed/wbr/914/Makefile
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
