test/configure
changeset 7794 7995e0920bf9
parent 7704 3182291fc65f
child 7803 97a1127629fb
     1.1 --- a/test/configure	Wed Oct 09 10:29:01 2013 -0300
     1.2 +++ b/test/configure	Wed Oct 09 11:30:01 2013 -0300
     1.3 @@ -587,6 +587,7 @@
     1.4  SDL_TTF_LIB
     1.5  XLIB
     1.6  GLLIB
     1.7 +GLESLIB
     1.8  CPP
     1.9  XMKMF
    1.10  SDL_CONFIG
    1.11 @@ -3785,7 +3786,7 @@
    1.12  fi
    1.13  
    1.14  if test x$have_x = xyes; then
    1.15 -    if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
    1.16 +    if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
    1.17          :
    1.18      else
    1.19          CFLAGS="$CFLAGS -I$ac_x_includes"
    1.20 @@ -3793,10 +3794,11 @@
    1.21      if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
    1.22          :
    1.23      else
    1.24 -        XPATH="-L$ac_x_libraries"
    1.25          if test "x$ac_x_libraries" = x; then
    1.26 +            XPATH=""
    1.27              XLIB="-lX11"
    1.28          else
    1.29 +            XPATH="-L$ac_x_libraries"
    1.30              XLIB="-L$ac_x_libraries -lX11"
    1.31          fi
    1.32      fi
    1.33 @@ -3859,14 +3861,14 @@
    1.34  $as_echo "$have_opengles" >&6; }
    1.35  
    1.36  GLLIB=""
    1.37 +GLESLIB=""
    1.38  if test x$have_opengles = xyes; then
    1.39      CFLAGS="$CFLAGS -DHAVE_OPENGLES"
    1.40 -    GLLIB="$XPATH -lGLESv1_CM"
    1.41 -elif test x$have_opengl = xyes; then
    1.42 +    GLESLIB="$XPATH -lGLESv1_CM"
    1.43 +fi
    1.44 +if test x$have_opengl = xyes; then
    1.45      CFLAGS="$CFLAGS -DHAVE_OPENGL"
    1.46      GLLIB="$XPATH $SYS_GL_LIBS"
    1.47 -else
    1.48 -    GLLIB=""
    1.49  fi
    1.50  
    1.51