[Robotflow-cvs] RobotFlow configure.in,1.47,1.48

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

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

Modified Files:
	configure.in 
Log Message:
--with-MARIE now working properly


Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure.in	2 Nov 2004 15:47:47 -0000	1.47
--- configure.in	16 Nov 2004 13:46:26 -0000	1.48
***************
*** 5,13 ****
  AC_INIT(Generic/include/Timer.h)
  
! #AC_INIT([RobotFlow], [0.2.4cvs], [rob...@li...])
  
  ROBOTFLOW_MAJOR_VERSION=0
  ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=4
  ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
  ROBOTFLOW_INTERFACE_AGE=0
--- 5,13 ----
  AC_INIT(Generic/include/Timer.h)
  
! #AC_INIT([RobotFlow], [0.2.5cvs], [rob...@li...])
  
  ROBOTFLOW_MAJOR_VERSION=0
  ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=5
  ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
  ROBOTFLOW_INTERFACE_AGE=0
***************
*** 167,185 ****
  	dnl Test for MARIE (Dominic Letourneau)
  	if test -n "$MARIE_DIR"; then
! 		AC_MSG_RESULT("Using MARIE in $MARIE_DIR")	
! 		MARIE_LIBS="-L$MARIE_DIR/lib -lmariedata -lmariecommon"
! 		MARIE_INCLUDES="-I$MARIE_DIR/include"
! 		MARIE_FOUND="yes"
  	else
  		AC_PATH_PROG(MARIE_CONFIG,marie-config,no,$PATH:$prefix/bin:$prefix/marie/bin)
! 		if test "$MARIE_CONFIG" != no; then
! 			MARIE_LIBS=`$MARIE_CONFIG --libs libmariedata`
! 			MARIE_INCLUDES=`$MARIE_CONFIG --cflags libmariedata`
! 			MARIE_FOUND="yes"
! 		else
! 			AC_MSG_RESULT("MARIE not found, MARIE disabled.")	
! 			MARIE_LIBS=""
! 			MARIE_INCLUDES=""
! 		fi
  	fi
  fi
--- 167,184 ----
  	dnl Test for MARIE (Dominic Letourneau)
  	if test -n "$MARIE_DIR"; then
! 		AC_MSG_RESULT("Using MARIE in $MARIE_DIR")
! 		AC_PATH_PROG(MARIE_CONFIG,marie-config,no,$MARIE_DIR/bin:$MARIE_DIR)	
  	else
  		AC_PATH_PROG(MARIE_CONFIG,marie-config,no,$PATH:$prefix/bin:$prefix/marie/bin)
! 	fi
! 
! 	if test "$MARIE_CONFIG" != no; then
! 		MARIE_LIBS=`$MARIE_CONFIG --libs libmariedata`
! 		MARIE_INCLUDES=`$MARIE_CONFIG --cflags libmariedata`
! 		MARIE_FOUND="yes"
! 	else
! 		AC_MSG_RESULT("MARIE not found, MARIE disabled.")	
! 		MARIE_LIBS=""
! 		MARIE_INCLUDES=""
  	fi
  fi