[Robotflow-cvs] RobotFlow Makefile.am,1.17,1.18 configure.in,1.33,1.34

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

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

Modified Files:
	Makefile.am configure.in 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am	30 May 2004 10:30:34 -0000	1.17
--- Makefile.am	30 May 2004 12:34:07 -0000	1.18
***************
*** 6,12 ****
  endif
  
  EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in
  
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR)
  
  rpm: 	dist
--- 6,16 ----
  endif
  
+ if WITH_MARIE
+ MARIE_DIR = MARIE
+ endif
+ 
  EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in
  
! SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR) $(MARIE_DIR)
  
  rpm: 	dist

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure.in	30 May 2004 10:19:19 -0000	1.33
--- configure.in	30 May 2004 12:34:07 -0000	1.34
***************
*** 71,75 ****
  AC_CHECK_FUNCS(getcwd getwd putenv strdup)
  
! dnl overflow-config test (Yannick Brosseau)
  
  AC_PATH_PROG(OVERFLOW_CONFIG,flowdesigner-config,no,$PATH:$FLOWDESIGNER_HOME/bin:$prefix/bin)
--- 71,75 ----
  AC_CHECK_FUNCS(getcwd getwd putenv strdup)
  
! dnl overflow-config test (Yannick Brosseau & Dominic Letourneau)
  
  AC_PATH_PROG(OVERFLOW_CONFIG,flowdesigner-config,no,$PATH:$FLOWDESIGNER_HOME/bin:$prefix/bin)
***************
*** 79,89 ****
--- 79,95 ----
   	if test "$OVERFLOW_CONFIG" = no; then
      		AC_MSG_ERROR( Cannot find overflow-config)
+ 		exit
   	fi
  fi
  
+ SDL_FOUND=""
  AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH)
  if test "$SDL_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find sdl-config, disabling SDL)	
+ else
+ 	SDL_FOUND="yes"
  fi
+ 
+ 
  AM_CONDITIONAL(WITH_SDL, test -n "$SDL_CONFIG")	
  
***************
*** 91,94 ****
--- 97,101 ----
  if test "$PKG_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find pkg-config)
+ 	exit
  fi
  
***************
*** 96,99 ****
--- 103,107 ----
  if test "$XML2_CONFIG" = no; then
  	AC_MSG_ERROR( Cannot find xml2-config)
+ 	exit
  fi
  
***************
*** 113,116 ****
--- 121,174 ----
  	  AM_CONDITIONAL(WITH_PLAYER,false)
  fi
+ 
+ dnl Test for ACE (Yannick Brosseau & Dominic Letourneau)
+ AC_MSG_CHECKING(for ACE)
+ ACE_FOUND=""
+ 
+ AC_ARG_WITH(ACE, [  --with-ACE              Where ACE is installed (/usr/local)], ACE_DIR="$withval";ACE_BASE=$withval)
+ 
+ dnl test which ACE_DIR, std way
+ if test -n "$ACE_DIR"; then
+ 	ACE_LIBS="-L$ACE_DIR/lib -lACE"
+ 	ACE_INCLUDES="-I$ACE_DIR/include"
+ 	AC_MSG_RESULT("found ACE_wrappers in $ACE_DIR")	
+ 	ACE_FOUND = "yes"
+ fi
+ 
+ dnl test with ACE_ROOT 
+ if test -n "$ACE_FOUND" && test -n "$ACE_ROOT"; then
+ 	dnl Now attempting in a ACE_wrappers style.	
+ 	AC_MSG_RESULT("found ACE_wrappers in $ACE_ROOT")
+ 	ACE_INCLUDE="$ACE_BASE"	
+ 	ACE_LIBS="-L$ACE_ROOT/ace -lACE"
+ 	ACE_INCLUDES="-I$ACE_ROOT"
+ 	ACE_FOUND = "yes"
+ fi
+ 
+ AC_SUBST(ACE_LIBS)
+ AC_SUBST(ACE_INCLUDES)
+ 
+ MARIE_FOUND=""
+ AC_ARG_WITH(ACE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval";MARIE_BASE=$withval)
+ 
+ dnl Test for MARIE (Dominic Letourneau)
+ 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"
+ 	AM_CONDITIONAL(WITH_MARIE,true)
+ else
+ 	AC_MSG_RESULT("MARIE disabled.")	
+ 	MARIE_LIBS=""
+ 	MARIE_INCLUDES=""
+ 	AM_CONDITIONAL(WITH_MARIE,false)
+ fi
+ 
+ AC_SUBST(MARIE_LIBS)
+ AC_SUBST(MARIE_INCLUDES)
+ 
+ 
+ 
  VERSION=$ROBOTFLOW_VERSION
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
***************
*** 185,188 ****
--- 243,249 ----
  	Generic/src/Makefile \
  	Generic/n-files/Makefile \
+ 	MARIE/Makefile \
+ 	MARIE/include/Makefile \
+ 	MARIE/src/Makefile \
  	RobotFlow.spec)
  
***************
*** 197,213 ****
  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
--- 258,277 ----
  AC_MSG_RESULT([])
  
! if test "$PLAYER_FOUND" = "yes"; then
  	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
  
! if test "$SDL_FOUND" = "yes"; then
  	AC_MSG_RESULT([$PACKAGE will build SDL based blocks])
  else
  	AC_MSG_RESULT([$PACKAGE will NOT build SDL based blocks])
  fi
+ 
+ if test "$MARIE_FOUND" = "yes"; then
+ 	AC_MSG_RESULT([$PACKAGE will build MARIE based blocks])
+ else
+ 	AC_MSG_RESULT([$PACKAGE will NOT build MARIE based blocks (forgot --with-MARIE=<path> and --with-ACE=<path> args?)])
+ fi
+