On Mon, Feb 08, 2010, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.
>
> Signed-off-by: TeLeMan <gele...@gmail.com>
> ---
> configure | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 4c95c27..213dddf 100644
> --- a/configure
> +++ b/configure
> @@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
> int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
> EOF
> sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
> - sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + if test "$static" = "yes" ; then
> + sdl_libs=`sdl-config --static-libs 2>/dev/null`
> + else
> + sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + fi
> if compile_prog "$sdl_cflags" "$sdl_libs" ; then
> if test "$_sdlversion" -lt 121 ; then
> sdl_too_old=yes
> @@ -1075,7 +1079,6 @@ EOF
>
> # static link with sdl ? (note: sdl.pc's --static --libs is broken)
> if test "$sdl" = "yes" -a "$static" = "yes" ; then
> - sdl_libs=`sdl-config --static-libs 2>/dev/null`
> if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
> sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
> sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`"
Signed-off-by: Loïc Minier <l...@dooz.org>
Ah right, the tests were being run on a shared libsdl no matter actual
linking would happen against the static or shared libsdl; thanks for
fixing the ordering.
--
Loïc Minier
