[Robotflow-cvs] RobotFlow configure.in,1.54,1.55

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

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

Modified Files:
	configure.in 
Log Message:
better player test

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configure.in	3 Aug 2005 19:52:54 -0000	1.54
--- configure.in	5 Oct 2005 15:24:30 -0000	1.55
***************
*** 5,9 ****
  AC_INIT(Generic/include/Timer.h)
  
! #AC_INIT([RobotFlow], [0.2.5cvs], [rob...@li...])
  
  
--- 5,9 ----
  AC_INIT(Generic/include/Timer.h)
  
! #AC_INIT([RobotFlow], [0.2.6cvs], [rob...@li...])
  
  
***************
*** 139,158 ****
  		PLAYER_FOUND="yes"
  	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"
! 		fi
  	fi
  fi
  
  dnl set WITH_PLAYER if player found and not disabled
! if test -n "$PLAYER_FOUND"; then
  	AM_CONDITIONAL(WITH_PLAYER,true)
  else
  	AM_CONDITIONAL(WITH_PLAYER,false)
  fi
  
--- 139,162 ----
  		PLAYER_FOUND="yes"
  	else
! 	        PKG_CHECK_MODULES(PLAYER, player = 1.5.0,[PLAYER_FOUND="yes"],[PLAYER_FOUND="no"] )	
! 		PLAYER_LIBS=$PLAYER_LIBS
! 		PLAYER_INCLUDES=$PLAYER_CFLAGS
  	fi
  fi
  
  dnl set WITH_PLAYER if player found and not disabled
! if test "$PLAYER_FOUND" = "yes"; then
  	AM_CONDITIONAL(WITH_PLAYER,true)
+ 	AC_MSG_RESULT([Using Player lib : $PLAYER_LIBS])
+ 	AC_MSG_RESULT([Using Player cflags : $PLAYER_CFLAGS])
+ 				     
  else
  	AM_CONDITIONAL(WITH_PLAYER,false)
+ 	PKG_CHECK_MODULES(PLAYER_V, player >= 1.5.0,[NEW_PLAYER_FOUND="yes"],[NEW_PLAYER_FOUND="no"] )
+ 	if test "$NEW_PLAYER_FOUND" = "yes"; then
+ 		AC_MSG_RESULT([Player > 1.5.0 found. RobotFlow requires Player 1.5.0 to work. Player compilation disabled.])
+ 	else
+ 		AC_MSG_RESULT([Player not found])
+ 	fi
  fi
  
***************
*** 286,290 ****
  	Audio/include/Makefile \
  	Audio/src/Makefile \
!    Vision/Makefile \
  	Vision/include/Makefile \
  	Vision/src/Makefile \
--- 290,294 ----
  	Audio/include/Makefile \
  	Audio/src/Makefile \
!    	Vision/Makefile \
  	Vision/include/Makefile \
  	Vision/src/Makefile \
***************
*** 333,337 ****
  	AC_MSG_RESULT([$PACKAGE will build Player based blocks])
  else
! 	AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks (forgot --with-player=<path> arg?)])
  fi
  
--- 337,345 ----
  	AC_MSG_RESULT([$PACKAGE will build Player based blocks])
  else
! 	if test "$NEW_PLAYER_FOUND" = "yes"; then
! 		AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks (version > 1.5.0 not yet supported)])
! 	else
! 		AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks (forgot --with-player=<path> arg?)])
! 	fi
  fi