[Robotflow-cvs] RobotFlow configure.in,1.38,1.39

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

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

Modified Files:
	configure.in 
Log Message:
using new marie-config script

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure.in	31 May 2004 12:53:27 -0000	1.38
--- configure.in	31 May 2004 13:55:47 -0000	1.39
***************
*** 170,177 ****
  	AM_CONDITIONAL(WITH_MARIE,true)
  else
! 	AC_MSG_RESULT("MARIE disabled.")	
! 	MARIE_LIBS=""
! 	MARIE_INCLUDES=""
! 	AM_CONDITIONAL(WITH_MARIE,false)
  fi
  
--- 170,186 ----
  	AM_CONDITIONAL(WITH_MARIE,true)
  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 libmariecommon`
! 		MARIE_INCLUDES=`$MARIE_CONFIG --cflags libmariedata libmariecommon`
! 		MARIE_FOUND="yes"
! 		AM_CONDITIONAL(WITH_MARIE,true)
! 	else
! 		AC_MSG_RESULT("MARIE disabled.")	
! 		MARIE_LIBS=""
! 		MARIE_INCLUDES=""
! 		AM_CONDITIONAL(WITH_MARIE,false)
! 	fi
  fi