Commit 4fbd25bc authored by Anthony Mallet's avatar Anthony Mallet Committed by Anthony Mallet
Browse files

Simplify the --enable-body option checks. Bump revision to 1.3.

parent acf1e734
dnl autoconf script for hppCore libs
dnl
dnl Research carried out within the scope of the Associated International Laboratory: Joint Japanese-French Robotics Laboratory (JRL)
dnl Research carried out within the scope of the Associated
dnl International Laboratory: Joint Japanese-French Robotics Laboratory (JRL)
dnl
dnl Author: Florent Lamiraux LAAS-CNRS
dnl
AC_INIT([hppCore],[1.2],[openrobots@laas.fr])
AC_INIT([hppCore],[1.3],[openrobots@laas.fr])
AC_PREREQ(2.59)
AM_INIT_AUTOMAKE([foreign no-define])
......@@ -22,8 +23,9 @@ KWSPLUS_PREFIX=`$PKG_CONFIG kwsPlus --variable=prefix`
AC_SUBST(KWSPLUS_PREFIX)
AC_SUBST(KWSPLUS_CFLAGS)
AC_SUBST(KWSPLUS_LIBS)
AC_ARG_ENABLE(body, AC_HELP_STRING([--enable-body],
[Implement ChppBody class (see INSTALL for more information)]), body=no, body=no)
[Implement ChppBody class (see INSTALL for more information)]),,[enable_body=no])
AC_SUBST(BODY_CFLAGS)
AC_SUBST(BODY_HEADER_PATH)
......@@ -33,26 +35,24 @@ AC_SUBST(HPPMODEL_LIBS)
AC_SUBST(HPPMODEL_TAGFILE, [])
AC_SUBST(HPPMODEL_PREFIX)
if test x${enable_body} = xyes; then
body=yes
fi
BODY_CFLAGS="IMPLEMENT_BODY=0"
BODY_HEADER_PATH="hppCore"
if test x${body} = xyes; then
if test x${enable_body} = xyes; then
BODY_CFLAGS="IMPLEMENT_BODY=1"
BODY_HEADER_PATH="hppModel"
AC_MSG_NOTICE([using internal implementation of ChppBody])
else
PKG_CHECK_MODULES(HPPMODEL, hppModel)
PKG_CHECK_MODULES(HPPMODEL, [hppModel >= 1.0])
AC_SUBST(HPPMODEL_CFLAGS)
AC_SUBST(HPPMODEL_LIBS)
HPPMODEL_PREFIX=`$PKG_CONFIG --variable=prefix hppModel`
HPPMODEL_TAGFILE="$HPPMODEL_PREFIX/share/doc/doxytag/hppModel.doxytag=$HPPMODEL_PREFIX/share/doc/hppModel"
HPPMODEL_REQD=",hppModel"
HPPMODEL_REQD=", hppModel >= 1.0"
AC_MSG_NOTICE([using external implementation of ChppBody])
fi
AM_CONDITIONAL(BODY, test x${body} = xyes)
AM_CONDITIONAL(BODY, test x${enable_body} = xyes)
AC_OUTPUT(Makefile
src/Makefile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment