test/configure.in
changeset 7794 7995e0920bf9
parent 7704 3182291fc65f
child 7828 1451063c8ecd
     1.1 --- a/test/configure.in	Wed Oct 09 10:29:01 2013 -0300
     1.2 +++ b/test/configure.in	Wed Oct 09 11:30:01 2013 -0300
     1.3 @@ -91,7 +91,7 @@
     1.4  dnl Check for X11 path, needed for OpenGL on some systems
     1.5  AC_PATH_X
     1.6  if test x$have_x = xyes; then
     1.7 -    if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
     1.8 +    if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
     1.9          :
    1.10      else
    1.11          CFLAGS="$CFLAGS -I$ac_x_includes"
    1.12 @@ -99,10 +99,11 @@
    1.13      if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
    1.14          :
    1.15      else
    1.16 -        XPATH="-L$ac_x_libraries"
    1.17          if test "x$ac_x_libraries" = x; then
    1.18 +            XPATH=""
    1.19              XLIB="-lX11"
    1.20          else
    1.21 +            XPATH="-L$ac_x_libraries"
    1.22              XLIB="-L$ac_x_libraries -lX11"
    1.23          fi
    1.24      fi
    1.25 @@ -135,17 +136,18 @@
    1.26  AC_MSG_RESULT($have_opengles)
    1.27  
    1.28  GLLIB=""
    1.29 +GLESLIB=""
    1.30  if test x$have_opengles = xyes; then
    1.31      CFLAGS="$CFLAGS -DHAVE_OPENGLES"
    1.32 -    GLLIB="$XPATH -lGLESv1_CM"
    1.33 -elif test x$have_opengl = xyes; then
    1.34 +    GLESLIB="$XPATH -lGLESv1_CM"
    1.35 +fi
    1.36 +if test x$have_opengl = xyes; then
    1.37      CFLAGS="$CFLAGS -DHAVE_OPENGL"
    1.38      GLLIB="$XPATH $SYS_GL_LIBS"
    1.39 -else
    1.40 -    GLLIB=""
    1.41  fi
    1.42  
    1.43  AC_SUBST(GLLIB)
    1.44 +AC_SUBST(GLESLIB)
    1.45  AC_SUBST(XLIB)
    1.46  
    1.47  dnl Check for SDL_ttf