diff options
author | Stijn Buys <ingar@osirion.org> | 2013-12-15 20:20:36 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-12-15 20:20:36 +0000 |
commit | 88047024d5d1d12dc581cd318667a89c2c5ec494 (patch) | |
tree | 064580e67ad4b4f3b24f1324f8479427059ea2e3 /configure.ac | |
parent | 232ec00456b96d65b11442819868e8e9e4a69367 (diff) |
Added --enable-static-libc option to the configure script,
automake syntax updates,
starsystem roadmap updates.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index f2a8a84..ff6cd2f 100644 --- a/configure.ac +++ b/configure.ac @@ -167,6 +167,20 @@ AC_ARG_ENABLE(debug_messages, ) dnl ---------------------------------------------------------------- +dnl static link +dnl + +AC_ARG_ENABLE(static_libc, + AC_HELP_STRING([--enable-static-libc], [staticly link with libc and libstdc++]), + AC_MSG_RESULT(yes) + STATIC_LDADD="-static-libgcc -static-libstdc++", + AC_MSG_RESULT(no) + STATIC_LDADD="" +) + +AC_SUBST(STATIC_LDADD) + +dnl ---------------------------------------------------------------- dnl curses dnl @@ -233,9 +247,7 @@ HAVE_BULLET=no AC_ARG_ENABLE(static_bullet, AC_HELP_STRING([--enable-static-bullet], [staticly link with bullet physics libraries]), AC_MSG_RESULT(yes), - STATIC_BULLET="yes" AC_MSG_RESULT(no) - STATIC_BULLET="no" ) AC_ARG_WITH(bullet, @@ -244,7 +256,7 @@ AC_ARG_WITH(bullet, ) ) -LD_FLAGS_save="$LD_FLAGS" +LDFLAGS_save="$LDFLAGS" CPPFLAGS_save="$CPPFLAGS" BULLET_DIR="/usr" @@ -271,10 +283,10 @@ else fi CPPFLAGS="$CPPFLAGS_save $BULLET_CPPFLAGS" -LD_FLAGS="$LD_FLAGS_save $BULLET_LIBS" +LDFLAGS="$LDFLAGS_save $BULLET_LIBS" CPPFLAGS="$CPPFLAGS_save" -LD_FLAGS="$LD_FLAGS_save" +LDFLAGS="$LDFLAGS_save" AC_SUBST(BULLET_CPPFLAGS) AC_SUBST(BULLET_LIBS) @@ -284,7 +296,7 @@ dnl zlib dnl LIBS_save="$LIBS" -LD_FLAGS_save="$LD_FLAGS" +LDFLAGS_save="$LDFLAGS" AC_CHECK_HEADER(zlib.h, [], @@ -296,7 +308,7 @@ AC_CHECK_LIB(z, compress, AC_MSG_ERROR([zlib not found]) ) -LD_FLAGS="$LD_FLAGS_save" +LDFLAGS="$LDFLAGS_save" LIBS="$LIBS_save" LIBZ_LIBS="-lz" @@ -321,7 +333,7 @@ if test "x${with_client}" = xno; then else AC_MSG_RESULT(yes) - LD_FLAGS_save="$LDFLAGS" + LDFLAGS_save="$LDFLAGS" dnl --------------------------------------------------------------- dnl OpenGL @@ -347,7 +359,7 @@ else ) fi - LD_FLAGS="$LD_FLAGS_save" + LDFLAGS="$LDFLAGS_save" GL_LIBS="$HOST_GL_LIBS" AC_SUBST(GL_LIBS) AC_SUBST(GL_CFLAGS) @@ -367,7 +379,7 @@ else ) fi - LD_FLAGS="$LD_FLAGS_save" + LDFLAGS="$LDFLAGS_save" AL_LIBS="$HOST_AL_LIBS" AC_SUBST(AL_LIBS) AC_SUBST(AL_CFLAGS) @@ -543,7 +555,7 @@ Configuration summary: platform ........... $host flags .............. $CPPFLAGS $CXXFLAGS -libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $LIBZ_LIBS $CURSES_LIBS +libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $LIBZ_LIBS $CURSES_LIBS $STATIC_LDADD bullet ............. $BULLET_LIBS curses ............. $HAVE_CURSES build client ....... $BUILD_CLIENT]) |