diff options
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 3ed21e6..437b4b1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,15 +2,16 @@ dnl ---------------------------------------------------------------- dnl append git revision to the version number dnl determine the git revision number +dnl note: the configure scripts needs to be regenerated to update the version number define([gitversion], esyscmd([sh -c "echo -n 'git'; git rev-parse --short HEAD | tr -d '\n'"])) -AC_INIT([osirion], [0.2.8-gitversion]) +AC_INIT([osirion],[0.2.8-gitversion]) AC_CONFIG_HEADERS(src/config.h) -AC_LANG_CPLUSPLUS +AC_LANG([C++]) AC_PROG_CXX -AC_PROG_LIBTOOL +LT_INIT AM_INIT_AUTOMAKE @@ -104,7 +105,7 @@ dnl *-*-mingw*) HOST_LIBS="-lws2_32" HOST_GL_LIBS="-lopengl32 -lglu32" - HOST_AL_LIBS="-lopenal" + HOST_AL_LIBS="-lopenal32" ICON_CLIENT="osirion-res.o" ICON_SERVER="osiriond-res.o" SDLMAIN="" @@ -147,7 +148,7 @@ dnl AC_MSG_CHECKING(whether to abort on compiler warnings) WARN_CFLAGS="$WARN_CLFAGS -Wall" AC_ARG_ENABLE(error, - AC_HELP_STRING([--disable-error], [do not abort on compiler warnings]), + AS_HELP_STRING([--disable-error],[do not abort on compiler warnings]), AC_MSG_RESULT(no), AC_MSG_RESULT(yes) WARN_CFLAGS="$WARN_CFLAGS -Werror" @@ -160,7 +161,7 @@ dnl AC_MSG_CHECKING(whether to include debug messages) AC_ARG_ENABLE(debug_messages, - AC_HELP_STRING([--disable-debug-messages], [build without extra debug messages]), + AS_HELP_STRING([--disable-debug-messages],[build without extra debug messages]), AC_MSG_RESULT(no), AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_DEBUG_MESSAGES, 1, [Define this to enable debug messages]) @@ -171,7 +172,7 @@ dnl static libc dnl AC_ARG_ENABLE(static_stdlib, - AC_HELP_STRING([--enable-static-stdlib], [staticly link with libgcc and libstdc++]), + AS_HELP_STRING([--enable-static-stdlib],[staticly link with libgcc and libstdc++]), AC_MSG_RESULT(yes) STATIC_LDADD="-static-libgcc -static-libstdc++", AC_MSG_RESULT(no) @@ -187,9 +188,7 @@ dnl HAVE_CURSES=no AC_ARG_WITH(curses, - AC_HELP_STRING([--without-curses], - [do not include curses support] - ) + AS_HELP_STRING([--without-curses],[do not include curses support]) ) if test "x${with_curses}" != "xno"; then @@ -245,15 +244,13 @@ dnl HAVE_BULLET=no AC_ARG_ENABLE(static_bullet, - AC_HELP_STRING([--enable-static-bullet], [staticly link with bullet physics libraries]), + AS_HELP_STRING([--enable-static-bullet],[staticly link with bullet physics libraries]), AC_MSG_RESULT(yes), AC_MSG_RESULT(no) ) AC_ARG_WITH(bullet, - AC_HELP_STRING([--with-bullet=PREFIX], - [link with bullet physics library installed in PREFIX] - ) + AS_HELP_STRING([--with-bullet=PREFIX],[link with bullet physics library installed in PREFIX]) ) LDFLAGS_save="$LDFLAGS" @@ -321,7 +318,7 @@ dnl BUILD_CLIENT=no AC_ARG_WITH(client, - AC_HELP_STRING([--without-client], [do not build the client application]) + AS_HELP_STRING([--without-client],[do not build the client application]) ) AC_MSG_CHECKING(whether to build client) @@ -491,9 +488,7 @@ dnl Installation paths AC_MSG_CHECKING(installation type) AC_ARG_ENABLE(single_directory, - AC_HELP_STRING( - [--enable-single-directory], [install everything in a single directory] - ), + AS_HELP_STRING([--enable-single-directory],[install everything in a single directory]), AC_MSG_RESULT(single directory) INSTALLTYPE="single directory", AC_MSG_RESULT(standard) |