Commit 7fc50affaa20b12f76105e110c5d869122f1e01b
2013-08-28T10:41:25
Fixes test building
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/test/configure b/test/configure
index 319c032..30b122e 100755
--- a/test/configure
+++ b/test/configure
@@ -3451,7 +3451,7 @@ rm -f core conftest.err conftest.$ac_objext \
rm -f conf.sdltest
CFLAGS="$CFLAGS $SDL_CFLAGS"
-LIBS="$LIBS -lSDL2_test $SDL_LIBS"
+LIBS="$LIBS $SDL_LIBS -lSDL2_test"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3785,16 +3785,16 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
fi
- if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
+ if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
XPATH="-L$ac_x_libraries"
- XLIB="-L$ac_x_libraries -lX11"
+ XLIB="-lX11"
fi
fi
diff --git a/test/configure.in b/test/configure.in
index b748007..7cca1ea 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -86,21 +86,21 @@ AM_PATH_SDL2($SDL_VERSION,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
)
CFLAGS="$CFLAGS $SDL_CFLAGS"
-LIBS="$LIBS -lSDL2_test $SDL_LIBS"
+LIBS="$LIBS $SDL_LIBS -lSDL2_test"
dnl Check for X11 path, needed for OpenGL on some systems
AC_PATH_X
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
fi
- if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
+ if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
XPATH="-L$ac_x_libraries"
- XLIB="-L$ac_x_libraries -lX11"
+ XLIB="-lX11"
fi
fi