diff options
| -rw-r--r-- | configure.in | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/configure.in b/configure.in index 7d72f8a..3280245 100644 --- a/configure.in +++ b/configure.in @@ -87,15 +87,15 @@ case "$host" in SDLMAIN="SDLMain.o" INSTALLTYPE="application bundle" OS=OSX - AC_MSG_RESULT(OS X) - AC_DEFINE_UNQUOTED(_OSX, 1, [Define this if you're building for native OS X]) + AC_MSG_RESULT(OS X) + AC_DEFINE_UNQUOTED(_OSX, 1, [Define this if you are building for native OS X]) dnl -dnl Don't rely on AC_PROG_OBJC presence (e.g. autoconf 2.59) +dnl Do not rely on AC_PROG_OBJC presence (e.g. autoconf 2.59) dnl http://www.mail-archive.com/xine-cvslog@lists.sourceforge.net/msg01693.html dnl - m4_ifdef( + m4_ifdef( + [AC_PROG_OBJC], [AC_PROG_OBJC], - [AC_PROG_OBJC], [AC_CHECK_TOOL([OBJC], [gcc]) AC_SUBST(OBJC) AC_SUBST(OBJCFLAGS)] @@ -103,8 +103,8 @@ dnl ;; *-*-mingw*) - HOST_LIBS="-lws2_32 -lz" - HOST_GL_LIBS="-lopengl32 -lglu32" + HOST_LIBS="-lws2_32 -lz" + HOST_GL_LIBS="-lopengl32 -lglu32" HOST_AL_LIBS="-lopenal32" ICON_CLIENT="osirion-res.o" ICON_SERVER="osiriond-res.o" @@ -116,11 +116,11 @@ dnl *) HOST_LIBS="-lz" HOST_GL_LIBS="-lGL -lGLU" - HOST_AL_LIBS="-lopenal" - ICON_CLIENT="" - ICON_SERVER="" - SDLMAIN="" - INSTALLTYPE="standard" + HOST_AL_LIBS="-lopenal" + ICON_CLIENT="" + ICON_SERVER="" + SDLMAIN="" + INSTALLTYPE="standard" AC_MSG_RESULT(generic unix) OS=UNIX ;; @@ -148,7 +148,7 @@ AC_MSG_CHECKING(whether to abort on compiler warnings) WARN_CFLAGS="" AC_ARG_ENABLE(warn, AC_HELP_STRING( - [--disable-warn], [don't abort on compiler warnings] + [--disable-warn], [do not abort on compiler warnings] ), AC_MSG_RESULT(no), AC_MSG_RESULT(yes) @@ -251,15 +251,14 @@ if test "x${with_bullet}" != "x"; then fi AC_MSG_RESULT([$BULLET_DIR]) -BULLET_CFLAGS="-I${BULLET_DIR}/include/bullet" -BULLET_LIBS="-L${BULLET_DIR}/lib" +BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet" +BULLET_LIBS="$BULLET_DIR/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a" -CPPFLAGS="$save_CPPFLAGS $BULLET_CFLAGS" +CPPFLAGS="$save_CPPFLAGS $BULLET_CPPFLAGS" LDFLAGS="$save_LDFLAGS $BULLET_LIBS" AC_CHECK_HEADER(btBulletDynamicsCommon.h, AC_DEFINE(HAVE_BULLET, yes, [Define this if you have the bullet physics library]) - BULLET_LIBS="$BULLET_LIBS -lBulletDynamics -lBulletCollision -lLinearMath" HAVE_BULLET="yes", AC_MSG_ERROR([bullet physics library not found (http://bulletphysics.org)]) ) @@ -267,8 +266,7 @@ AC_CHECK_HEADER(btBulletDynamicsCommon.h, CPPFLAGS="$save_CPPFLAGS" LDFLAGS="$save_LDFLAGS" - -AC_SUBST(BULLET_CFLAGS) +AC_SUBST(BULLET_CPPFLAGS) AC_SUBST(BULLET_LIBS) dnl ---------------------------------------------------------------- @@ -435,7 +433,7 @@ fi CXXFLAGS="-pipe $DEBUG_CFLAGS $WARN_CFLAGS $CXXFLAGS" AC_SUBST(CXXFLAGS) -CPPFLAGS="$CPPFLAGS $BULLET_CFLAGS" +CPPFLAGS="$CPPFLAGS $BULLET_CPPFLAGS" AC_SUBST(CPPFLAGS) dnl --------------------------------------------------------------- @@ -491,13 +489,13 @@ Configuration summary: platform ........... $host flags .............. $CPPFLAGS $CXXFLAGS -libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $CURSES_LIBS $BULLET_LIBS +libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $CURSES_LIBS +bullet ............. $BULLET_LIBS curses ............. $HAVE_CURSES -bullet ............. $HAVE_BULLET build client ....... $BUILD_CLIENT]) if test "x$BUILD_CLIENT" = xyes; then -AC_MSG_RESULT([SDL .................$LIBSDL_LIBS +AC_MSG_RESULT([SDL ................ $LIBSDL_LIBS opengl ............. $GL_LIBS openal ............. $AL_LIBS]) fi |