Fixed bug 4154 - Fix three empty variable tests in configure
authorSam Lantinga <slouken@libsdl.org>
Sat, 05 May 2018 10:31:03 -0700
changeset 11956f162f5d7798d
parent 11955 719dece50dde
child 11957 eba3a7c4ba16
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
configure
configure.in
     1.1 --- a/configure	Sat May 05 10:27:53 2018 -0700
     1.2 +++ b/configure	Sat May 05 10:31:03 2018 -0700
     1.3 @@ -15753,14 +15753,14 @@
     1.4  #done
     1.5  SDL_CFLAGS="$BASE_CFLAGS"
     1.6  SDL_LIBS="-lSDL2"
     1.7 -if  "$BASE_LDFLAGS" != "" ; then
     1.8 +if test "x$BASE_LDFLAGS" != x; then
     1.9      SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
    1.10  fi
    1.11 -if  "$EXTRA_CFLAGS" != "" ; then
    1.12 +if test "x$EXTRA_CFLAGS" != x; then
    1.13      CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
    1.14      CFLAGS="$CFLAGS $EXTRA_CFLAGS"
    1.15  fi
    1.16 -if  "$EXTRA_LDFLAGS" != "" ; then
    1.17 +if test "x$EXTRA_LDFLAGS" != x; then
    1.18      LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
    1.19  fi
    1.20  
     2.1 --- a/configure.in	Sat May 05 10:27:53 2018 -0700
     2.2 +++ b/configure.in	Sat May 05 10:31:03 2018 -0700
     2.3 @@ -124,14 +124,14 @@
     2.4  #done
     2.5  SDL_CFLAGS="$BASE_CFLAGS"
     2.6  SDL_LIBS="-lSDL2"
     2.7 -if [ "$BASE_LDFLAGS" != "" ]; then
     2.8 +if test "x$BASE_LDFLAGS" != x; then
     2.9      SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
    2.10  fi
    2.11 -if [ "$EXTRA_CFLAGS" != "" ]; then
    2.12 +if test "x$EXTRA_CFLAGS" != x; then
    2.13      CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
    2.14      CFLAGS="$CFLAGS $EXTRA_CFLAGS"
    2.15  fi
    2.16 -if [ "$EXTRA_LDFLAGS" != "" ]; then
    2.17 +if test "x$EXTRA_LDFLAGS" != x; then
    2.18      LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
    2.19  fi
    2.20