encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4154 - Fix three empty variable tests in configure 

Zack Middleton

Running top-level SDL configure on macOS 10.11 resulted in the errors below because automake removed the brackets about the tests.

./configure: line 15756: : command not found
./configure: line 15759: -Iinclude -I/Users/zack/SDL/include -idirafter /Users/zack/SDL/src/video/khronos : No such file or directory
./configure: line 15763: : command not found
This commit is contained in:
Sam Lantinga 2018-05-05 10:31:03 -07:00
parent 606c5a585c
commit 0bade9b411
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -15753,14 +15753,14 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS"
#done #done
SDL_CFLAGS="$BASE_CFLAGS" SDL_CFLAGS="$BASE_CFLAGS"
SDL_LIBS="-lSDL2" SDL_LIBS="-lSDL2"
if "$BASE_LDFLAGS" != "" ; then if test "x$BASE_LDFLAGS" != x; then
SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
fi fi
if "$EXTRA_CFLAGS" != "" ; then if test "x$EXTRA_CFLAGS" != x; then
CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
CFLAGS="$CFLAGS $EXTRA_CFLAGS" CFLAGS="$CFLAGS $EXTRA_CFLAGS"
fi fi
if "$EXTRA_LDFLAGS" != "" ; then if test "x$EXTRA_LDFLAGS" != x; then
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
fi fi

6
configure.in
View File

@ -124,14 +124,14 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS"
#done #done
SDL_CFLAGS="$BASE_CFLAGS" SDL_CFLAGS="$BASE_CFLAGS"
SDL_LIBS="-lSDL2" SDL_LIBS="-lSDL2"
if [ "$BASE_LDFLAGS" != "" ]; then if test "x$BASE_LDFLAGS" != x; then
SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
fi fi
if [ "$EXTRA_CFLAGS" != "" ]; then if test "x$EXTRA_CFLAGS" != x; then
CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
CFLAGS="$CFLAGS $EXTRA_CFLAGS" CFLAGS="$CFLAGS $EXTRA_CFLAGS"
fi fi
if [ "$EXTRA_LDFLAGS" != "" ]; then if test "x$EXTRA_LDFLAGS" != x; then
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
fi fi