[Robotflow-cvs] RobotFlow Makefile.am,1.13,1.14 configure.in,1.29,1.30

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

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

Modified Files:
	Makefile.am configure.in 
Log Message:
watch out, a lot of things have been modified in the installation structure, Player and librairies

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	8 Dec 2003 21:32:19 -0000	1.13
--- Makefile.am	27 May 2004 00:27:21 -0000	1.14
***************
*** 3,5 ****
--- 3,9 ----
  #AUTOMAKE_OPTIONS = no-dependencies
  
+ if WITH_PLAYER
  SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Player Probes FSM
+ else
+ SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM
+ endif

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure.in	20 May 2004 22:32:13 -0000	1.29
--- configure.in	27 May 2004 00:27:21 -0000	1.30
***************
*** 3,11 ****
  CXXFLAGS="-O2"
  
! AC_INIT(configure.in)
  
  ROBOTFLOW_MAJOR_VERSION=0
  ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=2
  ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
  ROBOTFLOW_INTERFACE_AGE=0
--- 3,11 ----
  CXXFLAGS="-O2"
  
! AC_INIT([RobotFlow], [0.2.3cvs], [rob...@li...])
  
  ROBOTFLOW_MAJOR_VERSION=0
  ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=3
  ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
  ROBOTFLOW_INTERFACE_AGE=0
***************
*** 46,49 ****
--- 46,50 ----
  AC_ENABLE_SHARED
  AM_PROG_LIBTOOL
+ AC_LANG_CPLUSPLUS
  
  AC_ARG_PROGRAM
***************
*** 83,89 ****
  AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH)
  if test "$SDL_CONFIG" = no; then
! 	AC_MSG_ERROR( Cannot find sdl-config)
  fi
! 
  
  AC_PATH_PROG(PKG_CONFIG,pkg-config,no,$PATH)
--- 84,90 ----
  AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH)
  if test "$SDL_CONFIG" = no; then
! 	AC_MSG_ERROR( Cannot find sdl-config, disabling SDL)	
  fi
! AM_CONDITIONAL(WITH_SDL, test -n "$SDL_CONFIG")	
  
  AC_PATH_PROG(PKG_CONFIG,pkg-config,no,$PATH)
***************
*** 97,103 ****
  fi
  
! AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
  
! dnl AM_MAINTAINER_MODE
   
  dnl Additional includes & libraries
--- 98,140 ----
  fi
  
! dnl Test for Player (Yannick Brosseau & Dominic Letourneau)
! AC_MSG_CHECKING(for player)
! PLAYER_FOUND=""
  
! AC_ARG_WITH(player, [  --with-player              Where player is installed (/usr)], PLAYER_DIR="$withval")
! 
! 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
   
  dnl Additional includes & libraries
***************
*** 120,124 ****
  XML2_LIB=`$XML2_CONFIG --libs`
  
! prefix=$OVERFLOW_DATA
  
  AC_SUBST(GNOME_LIB)
--- 157,161 ----
  XML2_LIB=`$XML2_CONFIG --libs`
  
! prefix=$OVERFLOW_DATA/$PACKAGE
  
  AC_SUBST(GNOME_LIB)
***************
*** 135,138 ****
--- 172,177 ----
  AC_SUBST(XML2_INCLUDE)
  AC_SUBST(XML2_LIB)
+ AC_SUBST(PLAYER_LIBS)
+ AC_SUBST(PLAYER_INCLUDES)
  
  dnl Output Files (makefiles)
***************
*** 167,168 ****
--- 206,233 ----
  	Generic/src/Makefile \
  	Generic/n-files/Makefile)
+ 
+ 
+ dnl Notification message for the user to know which flags will be used for compilation
+ dnl should use AC_MSG_NOTICE(), but that's apparently not defined in autoconf 2.13
+ AC_MSG_RESULT([])
+ AC_MSG_RESULT([*************************************************************])
+ AC_MSG_RESULT([])
+ AC_MSG_RESULT([$PACKAGE will be built on a $build system to run])
+ AC_MSG_RESULT([on a $host system, with the following options:])
+ AC_MSG_RESULT([])
+ 
+ AC_MSG_RESULT([$WITH_PLAYER - $WITH_SDL])
+ 
+ if test "$WITH_PLAYER" = "true"; then
+ 	AC_MSG_RESULT([$PACKAGE will build Player based blocks])
+ else
+ 	AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks])
+ fi
+ 
+ 
+ 
+ if test "$WITH_SDL" = "true"; then
+ 	AC_MSG_RESULT([$PACKAGE will build SDL based blocks])
+ else
+ 	AC_MSG_RESULT([$PACKAGE will NOT build SDL based blocks])
+ fi