[Robotflow-cvs] RobotFlow configure.in,1.30,1.31

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

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

Modified Files:
	configure.in 
Log Message:
fixed Player library linking problem

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure.in	27 May 2004 00:27:21 -0000	1.30
--- configure.in	27 May 2004 01:29:10 -0000	1.31
***************
*** 106,138 ****
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
-    CXXFLAGS="-I$PLAYER_DIR/include"
-    LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
-    AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes")
-    if test -n "$PLAYER_FOUND"; then
        AC_MSG_RESULT(found in $PLAYER_DIR)
        PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
        PLAYER_INCLUDES="-I$PLAYER_DIR/include"
!    else
!       AC_MSG_RESULT(Invalid with-player arg)
!       exit
!    fi
! fi
! 
! dnl test if it is installed in /usr
! if test -z "$PLAYER_FOUND"; then
!    LIBS="-lplayerclient"
!    AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes")
!    if test -n "$PLAYER_FOUND"; then
!       AC_MSG_RESULT(yes)
!       PLAYER_LIBS="-lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
!       PLAYER_INCLUDES=""
!    else
!       AC_MSG_RESULT([not found, disabling Player support])
! 
!    fi
  fi
  
- AM_CONDITIONAL(WITH_PLAYER, test -n "$PLAYER_FOUND")
- 
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
  AM_MAINTAINER_MODE
--- 106,117 ----
  dnl test which PLAYER_DIR
  if test -n "$PLAYER_DIR"; then
        AC_MSG_RESULT(found in $PLAYER_DIR)
        PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue"
        PLAYER_INCLUDES="-I$PLAYER_DIR/include"
! 	  AM_CONDITIONAL(WITH_PLAYER,true)
! else
! 	  AM_CONDITIONAL(WITH_PLAYER,false)
  fi
  
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
  AM_MAINTAINER_MODE