Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
authorSam Lantinga <slouken@libsdl.org>
Mon, 01 May 2006 07:23:46 +0000
changeset 175591063c450171
parent 1754 c67921b517c3
child 1756 eed7a3f396ce
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
sdl.m4
test/acinclude.m4
     1.1 --- a/sdl.m4	Mon May 01 07:15:35 2006 +0000
     1.2 +++ b/sdl.m4	Mon May 01 07:23:46 2006 +0000
     1.3 @@ -20,19 +20,21 @@
     1.4  		    , enable_sdltest=yes)
     1.5  
     1.6    if test x$sdl_exec_prefix != x ; then
     1.7 -     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
     1.8 -     if test x${SDL_CONFIG+set} != xset ; then
     1.9 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    1.10 -     fi
    1.11 +    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
    1.12 +    if test x${SDL_CONFIG+set} != xset ; then
    1.13 +      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    1.14 +    fi
    1.15    fi
    1.16    if test x$sdl_prefix != x ; then
    1.17 -     sdl_args="$sdl_args --prefix=$sdl_prefix"
    1.18 -     if test x${SDL_CONFIG+set} != xset ; then
    1.19 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    1.20 -     fi
    1.21 +    sdl_args="$sdl_args --prefix=$sdl_prefix"
    1.22 +    if test x${SDL_CONFIG+set} != xset ; then
    1.23 +      SDL_CONFIG=$sdl_prefix/bin/sdl-config
    1.24 +    fi
    1.25    fi
    1.26  
    1.27 -  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    1.28 +  if test "x$prefix" != xNONE; then
    1.29 +    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    1.30 +  fi
    1.31    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
    1.32    min_sdl_version=ifelse([$1], ,0.11.0,$1)
    1.33    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
     2.1 --- a/test/acinclude.m4	Mon May 01 07:15:35 2006 +0000
     2.2 +++ b/test/acinclude.m4	Mon May 01 07:23:46 2006 +0000
     2.3 @@ -20,19 +20,21 @@
     2.4  		    , enable_sdltest=yes)
     2.5  
     2.6    if test x$sdl_exec_prefix != x ; then
     2.7 -     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
     2.8 -     if test x${SDL_CONFIG+set} != xset ; then
     2.9 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    2.10 -     fi
    2.11 +    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
    2.12 +    if test x${SDL_CONFIG+set} != xset ; then
    2.13 +       SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    2.14 +    fi
    2.15    fi
    2.16    if test x$sdl_prefix != x ; then
    2.17 -     sdl_args="$sdl_args --prefix=$sdl_prefix"
    2.18 -     if test x${SDL_CONFIG+set} != xset ; then
    2.19 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    2.20 -     fi
    2.21 +    sdl_args="$sdl_args --prefix=$sdl_prefix"
    2.22 +    if test x${SDL_CONFIG+set} != xset ; then
    2.23 +       SDL_CONFIG=$sdl_prefix/bin/sdl-config
    2.24 +    fi
    2.25    fi
    2.26  
    2.27 -  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    2.28 +  if test "x$prefix" != xNONE; then
    2.29 +    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    2.30 +  fi
    2.31    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
    2.32    min_sdl_version=ifelse([$1], ,0.11.0,$1)
    2.33    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)