diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-12-03 22:02:45 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-12-03 22:02:45 +0100 |
| commit | 473d98a9cffea603ccc3ab62a0872e0058524eb3 (patch) | |
| tree | d69e8201505bdb7cca8fe65b95499c1fedb8b5f7 /configure.ac | |
| parent | 3b4f24db2b17b5e16a21becbbf22cc86e4ac3089 (diff) | |
build system fixes for 0.6 static
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 71d48544..3023cc20 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([deadbeef], [0.6.0]) +AC_INIT([deadbeef], [devel]) AC_CONFIG_HEADER(config.h) @@ -28,11 +28,6 @@ test "$prefix" = NONE && prefix=/usr/local AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory]) case "$host" in - *-*-gnu) - NOCPPLIB="-nostdlib -lsupc++";; -esac - -case "$host" in i686-apple-*) AC_DEFINE(ARCH_X86_32, 1, [architecture is x86 on OSX]) LIB="../deadbeef-deps/lib-x86-32-apple" @@ -58,7 +53,6 @@ case "$host" in LIB="../deadbeef-deps/lib-x86-64" YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64" APE_USE_YASM=yes - KILLCPPFLAGS="-nostdlib -lsupc++" ;; powerpc-*-* ) AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32]) @@ -72,10 +66,19 @@ case "$host" in AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown]) ;; esac -AC_SUBST(NOCPPLIB) AC_SUBST(LIB) AC_SUBST(YASM_FLAGS) +case "$host" in + *-*-gnu) + AS_IF([test "${enable_staticlink}" != "no"], [ + NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a" + ], [ + NOCPPLIB="-nostdlib -lsupc++" + ]);; +esac +AC_SUBST(NOCPPLIB) + test "x$prefix" = xNONE && prefix=$ac_default_prefix dnl INSANE_CFLAGS="-Wformat -Wdisabled-optimization -Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast" |