[Robotflow-cvs] RobotFlow configure.in,1.35,1.36

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

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

Modified Files:
	configure.in 
Log Message:
detecting MARIE properly

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure.in	30 May 2004 12:47:50 -0000	1.35
--- configure.in	30 May 2004 14:13:57 -0000	1.36
***************
*** 127,131 ****
  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
--- 127,131 ----
  ACE_FOUND=""
  
! AC_ARG_WITH(ACE, [  --with-ACE              Where ACE is installed (/usr/local)], ACE_DIR="$withval")
  
  dnl test which ACE_DIR, std way
***************
*** 134,148 ****
  	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
  
--- 134,147 ----
  	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 -z "$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_LIBS="-L$ACE_ROOT/ace -lACE"
  	ACE_INCLUDES="-I$ACE_ROOT"
! 	ACE_FOUND="yes"
  fi
  
***************
*** 152,156 ****
  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)
--- 151,155 ----
  MARIE_FOUND=""
  
! AC_ARG_WITH(MARIE, [  --with-MARIE              Where MARIE is installed (/usr/local)], MARIE_DIR="$withval")
  
  dnl Test for MARIE (Dominic Letourneau)
***************
*** 159,163 ****
  	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
! 	MARIE_FOUND = "yes"
  	AM_CONDITIONAL(WITH_MARIE,true)
  else
--- 158,162 ----
  	MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata"
  	MARIE_INCLUDES="-I$MARIE_DIR/include"
! 	MARIE_FOUND="yes"
  	AM_CONDITIONAL(WITH_MARIE,true)
  else