diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-20 01:13:13 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-20 01:13:13 +0000 |
| commit | f71b6b92840a396500aa477a6dba94be4c36d3bb (patch) | |
| tree | 2590921c78d1b49f80d92a03cfab0c8eda315b8d /configure.in | |
| parent | 9e14b5257514e45c3626063ce44ec2150d979ee8 (diff) | |
have configure only look for bullet in /usr by default, --with-bullet=prefix switch overrides,
updated documentation
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 3fadb1b..d9f577d 100644 --- a/configure.in +++ b/configure.in @@ -250,32 +250,22 @@ AC_ARG_WITH(bullet, LD_FLAGS_save="$LD_FLAGS" CPPFLAGS_save="$CPPFLAGS" -BULLET_DIRS="/usr/local /usr" +BULLET_DIR="/usr" if test "x${with_bullet}" != "x"; then - BULLET_DIRS="${with_bullet}" + BULLET_DIR="${with_bullet}" fi -for dir_to_test in ${BULLET_DIRS}; do - if test "x${BULLET_DIR}" = "x"; then - CPPFLAGS="-I${dir_to_test}/include/bullet" - AC_CHECK_HEADER(btBulletDynamicsCommon.h, - BULLET_DIR="${dir_to_test}", - [] - ) - fi -done - -if test "x${BULLET_DIR}" = "x"; then - AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIRS}]) -fi +CPPFLAGS="-I${BULLET_DIR}/include/bullet" -AC_MSG_CHECKING([for bullet prefix]) -AC_MSG_RESULT([${BULLET_DIR}]) +AC_CHECK_HEADER(btBulletDynamicsCommon.h, + [], + AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIR}]) +) AC_MSG_CHECKING([if static linking of the bullet libraries is requested]) if test "x${enable_static_bullet}" = "xyes"; then BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet" - BULLET_LIBS="$BULLET_DIR/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a" + BULLET_LIBS="${BULLET_DIR}/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a" AC_MSG_RESULT([yes]) else BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet" |