Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28867
Modified Files:
RobotFlow.spec.in configure.in
Log Message:
detecting MARIE version before compiling
Index: RobotFlow.spec.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RobotFlow.spec.in 23 Jul 2004 17:20:52 -0000 1.4
--- RobotFlow.spec.in 2 Nov 2004 15:47:47 -0000 1.5
***************
*** 46,51 ****
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
! --disable-static \
! --disable-MARIE
%{__make}
--- 46,50 ----
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
! --disable-static
%{__make}
Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** configure.in 26 Aug 2004 12:11:39 -0000 1.46
--- configure.in 2 Nov 2004 15:47:47 -0000 1.47
***************
*** 5,9 ****
AC_INIT(Generic/include/Timer.h)
! #AC_INIT([RobotFlow], [0.2.3cvs], [rob...@li...])
ROBOTFLOW_MAJOR_VERSION=0
--- 5,9 ----
AC_INIT(Generic/include/Timer.h)
! #AC_INIT([RobotFlow], [0.2.4cvs], [rob...@li...])
ROBOTFLOW_MAJOR_VERSION=0
***************
*** 75,78 ****
--- 75,85 ----
dnl overflow-config test (Yannick Brosseau & Dominic Letourneau)
+ AC_PATH_PROG(AWK_PROG,awk,no,$PATH:$prefix/bin)
+ if test "$AWK_PROG" = no; then
+ AC_MSG_ERROR(awk is required to configure RobotFlow properly, please install it and try again.)
+ exit
+ fi
+
+
AC_PATH_PROG(OVERFLOW_CONFIG,flowdesigner-config,no,$PATH:$FLOWDESIGNER_HOME/bin:$prefix/bin)
if test "$OVERFLOW_CONFIG" = no; then
***************
*** 156,183 ****
AC_MSG_RESULT("MARIE disabled by user")
else
- # 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")
- #
- # 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 -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
-
-
AC_ARG_WITH(MARIE, [ --with-MARIE Where MARIE is installed (/usr/local)], MARIE_DIR="$withval")
--- 163,166 ----
***************
*** 204,208 ****
dnl set WITH_MARIE if MARIE is found
if test -n "$MARIE_FOUND"; then
! AM_CONDITIONAL(WITH_MARIE,true)
else
AM_CONDITIONAL(WITH_MARIE,false)
--- 187,205 ----
dnl set WITH_MARIE if MARIE is found
if test -n "$MARIE_FOUND"; then
!
! #check for marie version
! MARIE_VERSION=`$MARIE_CONFIG --version | awk '{print $2}'`
!
! MARIE_MAJOR=`echo "$MARIE_VERSION" | awk -F"." '{print $1}'`
! MARIE_MINOR=`echo "$MARIE_VERSION" | awk -F"." '{print $2}'`
!
! if test $MARIE_MAJOR -ge 0 -a $MARIE_MINOR -ge 2; then
! AC_MSG_RESULT([Using MARIE version : $MARIE_VERSION])
! AM_CONDITIONAL(WITH_MARIE,true)
! else
! AC_MSG_RESULT([A newer version of MARIE required (>= 0.2.0), found version : $MARIE_VERSION])
! AC_MSG_RESULT(Disabling MARIE support.)
! AM_CONDITIONAL(WITH_MARIE,false)
! fi
else
AM_CONDITIONAL(WITH_MARIE,false)
|
