Skip to content
Permalink
Browse files

Fixes test building

  • Loading branch information
gabomdq committed Aug 28, 2013
1 parent ad20c80 commit 7fc50affaa20b12f76105e110c5d869122f1e01b
Showing with 8 additions and 8 deletions.
  1. +4 −4 test/configure
  2. +4 −4 test/configure.in
@@ -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

@@ -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

0 comments on commit 7fc50af

Please sign in to comment.