From 7fc50affaa20b12f76105e110c5d869122f1e01b Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Wed, 28 Aug 2013 10:41:25 -0300 Subject: [PATCH] Fixes test building --- test/configure | 8 ++++---- test/configure.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/configure b/test/configure index 319c03298..30b122e4a 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 b74800758..7cca1ea0f 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