[Robotflow-cvs] RobotFlow configure.in,1.40,1.41

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18910

Modified Files:
	configure.in 
Log Message:
auto-detection of player properly

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.in	31 May 2004 14:02:29 -0000	1.40
--- configure.in	31 May 2004 14:58:15 -0000	1.41
***************
*** 120,128 ****
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 	dnl test for player with prefix
! 	if test -e "$prefix/bin/player"; then
! 		AC_MSG_RESULT("found in $prefix")  
! 		PLAYER_LIBS="-L$prefix/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!     	PLAYER_INCLUDES="-I$prefix/include"
      	PLAYER_FOUND="yes"
      	AM_CONDITIONAL(WITH_PLAYER,true)	
--- 120,130 ----
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
! 
! 	dnl test for player with prefix & PATH
! 	AC_PATH_PROG(PLAYER_BIN,player,no,$PATH:$prefix/bin:$prefix/player/bin)
!     if test "$PLAYER_BIN" != no; then
! 		PLAYER_DIR=`which $PLAYER_BIN | sed 's/bin\/player$//' `
! 		PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!     	PLAYER_INCLUDES="-I$PLAYER_DIR/include"
      	PLAYER_FOUND="yes"
      	AM_CONDITIONAL(WITH_PLAYER,true)	
***************
*** 165,169 ****
  if test -n "$ACE_FOUND" && test -n "$MARIE_DIR"; then
  	AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
! 	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
  	MARIE_FOUND="yes"
--- 167,171 ----
  if test -n "$ACE_FOUND" && test -n "$MARIE_DIR"; then
  	AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
! 	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata -lmariecommon"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
  	MARIE_FOUND="yes"