[Robotflow-cvs] RobotFlow RobotFlow.pc.in,NONE,1.1 configure.in,1.53,1.54 Makefile.am,1.21,1.22

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

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

Modified Files:
	configure.in Makefile.am 
Added Files:
	RobotFlow.pc.in 
Log Message:
testing pkg-config scripts, fixed Probes compilation


Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.am	28 Jul 2005 15:01:15 -0000	1.21
--- Makefile.am	3 Aug 2005 19:52:54 -0000	1.22
***************
*** 18,21 ****
--- 18,26 ----
  SUBDIRS = Pioneer2 Generic Behaviors Audio Vision Control Devices Probes FSM $(MARIE_DIR) $(OPENCV_DIR)
  
+ # create the pkg-config entries
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = RobotFlow.pc
+ 
+ 
  rpm: 	dist
  	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** configure.in	3 Aug 2005 18:41:37 -0000	1.53
--- configure.in	3 Aug 2005 19:52:54 -0000	1.54
***************
*** 7,10 ****
--- 7,13 ----
  #AC_INIT([RobotFlow], [0.2.5cvs], [rob...@li...])
  
+ 
+ AC_PREREQ(2.53)
+ 
  ROBOTFLOW_MAJOR_VERSION=0
  ROBOTFLOW_MINOR_VERSION=2
***************
*** 211,214 ****
--- 214,218 ----
  if test "$OPENCV_FOUND" = "yes"; then
  	AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS])
+ 	AC_MSG_RESULT([Using OpenCV cflags : $OPENCV_CFLAGS])
  	AM_CONDITIONAL(WITH_OPENCV,true)
  else
***************
*** 217,222 ****
  fi
  
- #AC_SUBST(ACE_LIBS)
- #AC_SUBST(ACE_INCLUDES)
  AC_SUBST(MARIE_LIBS)
  AC_SUBST(MARIE_INCLUDES)
--- 221,224 ----
***************
*** 315,319 ****
  	OpenCV/src/Makefile \
  	OpenCV/n-files/Makefile \
! 	RobotFlow.spec)
  
  
--- 317,322 ----
  	OpenCV/src/Makefile \
  	OpenCV/n-files/Makefile \
! 	RobotFlow.spec \
! 	RobotFlow.pc)
  
  
***************
*** 342,346 ****
  	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
  
--- 345,349 ----
  	AC_MSG_RESULT([$PACKAGE will build MARIE based blocks])
  else
! 	AC_MSG_RESULT([$PACKAGE will NOT build MARIE based blocks (forgot --with-MARIE=<path>])
  fi
  

--- NEW FILE: RobotFlow.pc.in ---
Name: robotflow
Description: RobotFlow toolkit for FlowDesigner
Version: @VERSION@
Requires: 
Libs: -L${prefix}/lib
Cflags: -I${prefix}/include @OVERFLOW_INCLUDES@