Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18544
Modified Files:
configure.in
Log Message:
fixed for gcc 4.1.2 and prefix configuration
Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** configure.in 4 Dec 2006 18:17:55 -0000 1.59
--- configure.in 4 Dec 2006 19:19:57 -0000 1.60
***************
*** 2,10 ****
CFLAGS="-O2"
CXXFLAGS="-O2"
AC_INIT(Generic/include/Timer.h)
!
! #AC_INIT([RobotFlow], [0.2.6cvs], [rob...@li...])
!
AC_PREREQ(2.53)
--- 2,9 ----
CFLAGS="-O2"
CXXFLAGS="-O2"
+ PACKAGE=RobotFlow
AC_INIT(Generic/include/Timer.h)
! dnl AC_INIT([RobotFlow], [0.2.7cvs], [rob...@li...])
AC_PREREQ(2.53)
***************
*** 12,16 ****
ROBOTFLOW_MAJOR_VERSION=0
ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=6
ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
ROBOTFLOW_INTERFACE_AGE=0
--- 11,15 ----
ROBOTFLOW_MAJOR_VERSION=0
ROBOTFLOW_MINOR_VERSION=2
! ROBOTFLOW_MICRO_VERSION=7
ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION
ROBOTFLOW_INTERFACE_AGE=0
***************
*** 36,41 ****
VERSION=$ROBOTFLOW_VERSION
- PACKAGE=RobotFlow
-
dnl Checks for programs.
--- 35,38 ----
***************
*** 260,266 ****
prefix=$OVERFLOW_DATA/$PACKAGE
USING_FD_PREFIX="yes"
- else
- dnl this will work, but we should maybe change the variable name
- OVERFLOW_DATA=$prefix
fi
--- 257,260 ----
***************
*** 326,333 ****
Sensors/include/Makefile \
Sensors/src/Makefile \
! ut/Makefile \
ut/include/Makefile \
ut/src/Makefile \
! RobotFlow.spec \
RobotFlow.pc)
--- 320,327 ----
Sensors/include/Makefile \
Sensors/src/Makefile \
! ut/Makefile \
ut/include/Makefile \
ut/src/Makefile \
! RobotFlow.spec \
RobotFlow.pc)
***************
*** 374,378 ****
AC_MSG_RESULT([Installation directory : $prefix])
else
! AC_MSG_RESULT([*** WARNING *** $PACKAGE will be installed at the user defined location. Do NOT specify the --prefix option if you want the default FlowDesigner toolbox directory.])
AC_MSG_RESULT([Installation directory : $prefix])
fi
--- 368,372 ----
AC_MSG_RESULT([Installation directory : $prefix])
else
! AC_MSG_RESULT([*** WARNING *** $PACKAGE will be installed at the user defined location. Do NOT specify the --prefix option if you want to use the default FlowDesigner toolbox directory (automatic detection). Do not forget to set your FLOWDESIGNER_PATH environment variable, otherwise the RobotFlow toolboxes won't be loaded by FlowDesigner.])
AC_MSG_RESULT([Installation directory : $prefix])
fi
|
