configure
changeset 6188 e82023802002
parent 6116 66f48d6bf735
child 6217 6952b11b7f46
     1.1 --- a/configure	Sun Jan 08 01:15:20 2012 -0500
     1.2 +++ b/configure	Sun Jan 08 02:23:37 2012 -0500
     1.3 @@ -1562,6 +1562,7 @@
     1.4                            [default=yes]
     1.5    --enable-video-dummy    use dummy video driver [default=yes]
     1.6    --enable-video-opengl   include OpenGL support [default=yes]
     1.7 +  --enable-video-opengles include OpenGL ES support [default=yes]
     1.8    --enable-input-events   use Linux 2.4 unified input interface
     1.9                            [default=yes]
    1.10    --enable-input-tslib    use the Touchscreen library for input
    1.11 @@ -3772,13 +3773,13 @@
    1.12  else
    1.13    lt_cv_nm_interface="BSD nm"
    1.14    echo "int some_variable = 0;" > conftest.$ac_ext
    1.15 -  (eval echo "\"\$as_me:3775: $ac_compile\"" >&5)
    1.16 +  (eval echo "\"\$as_me:3776: $ac_compile\"" >&5)
    1.17    (eval "$ac_compile" 2>conftest.err)
    1.18    cat conftest.err >&5
    1.19 -  (eval echo "\"\$as_me:3778: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    1.20 +  (eval echo "\"\$as_me:3779: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    1.21    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    1.22    cat conftest.err >&5
    1.23 -  (eval echo "\"\$as_me:3781: output\"" >&5)
    1.24 +  (eval echo "\"\$as_me:3782: output\"" >&5)
    1.25    cat conftest.out >&5
    1.26    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    1.27      lt_cv_nm_interface="MS dumpbin"
    1.28 @@ -5005,7 +5006,7 @@
    1.29    ;;
    1.30  *-*-irix6*)
    1.31    # Find out which ABI we are using.
    1.32 -  echo '#line 5008 "configure"' > conftest.$ac_ext
    1.33 +  echo '#line 5009 "configure"' > conftest.$ac_ext
    1.34    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    1.35    (eval $ac_compile) 2>&5
    1.36    ac_status=$?
    1.37 @@ -7166,11 +7167,11 @@
    1.38     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.39     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.40     -e 's:$: $lt_compiler_flag:'`
    1.41 -   (eval echo "\"\$as_me:7169: $lt_compile\"" >&5)
    1.42 +   (eval echo "\"\$as_me:7170: $lt_compile\"" >&5)
    1.43     (eval "$lt_compile" 2>conftest.err)
    1.44     ac_status=$?
    1.45     cat conftest.err >&5
    1.46 -   echo "$as_me:7173: \$? = $ac_status" >&5
    1.47 +   echo "$as_me:7174: \$? = $ac_status" >&5
    1.48     if (exit $ac_status) && test -s "$ac_outfile"; then
    1.49       # The compiler can only warn and ignore the option if not recognized
    1.50       # So say no if there are warnings other than the usual output.
    1.51 @@ -7505,11 +7506,11 @@
    1.52     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.53     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.54     -e 's:$: $lt_compiler_flag:'`
    1.55 -   (eval echo "\"\$as_me:7508: $lt_compile\"" >&5)
    1.56 +   (eval echo "\"\$as_me:7509: $lt_compile\"" >&5)
    1.57     (eval "$lt_compile" 2>conftest.err)
    1.58     ac_status=$?
    1.59     cat conftest.err >&5
    1.60 -   echo "$as_me:7512: \$? = $ac_status" >&5
    1.61 +   echo "$as_me:7513: \$? = $ac_status" >&5
    1.62     if (exit $ac_status) && test -s "$ac_outfile"; then
    1.63       # The compiler can only warn and ignore the option if not recognized
    1.64       # So say no if there are warnings other than the usual output.
    1.65 @@ -7610,11 +7611,11 @@
    1.66     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.67     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.68     -e 's:$: $lt_compiler_flag:'`
    1.69 -   (eval echo "\"\$as_me:7613: $lt_compile\"" >&5)
    1.70 +   (eval echo "\"\$as_me:7614: $lt_compile\"" >&5)
    1.71     (eval "$lt_compile" 2>out/conftest.err)
    1.72     ac_status=$?
    1.73     cat out/conftest.err >&5
    1.74 -   echo "$as_me:7617: \$? = $ac_status" >&5
    1.75 +   echo "$as_me:7618: \$? = $ac_status" >&5
    1.76     if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1.77     then
    1.78       # The compiler can only warn and ignore the option if not recognized
    1.79 @@ -7665,11 +7666,11 @@
    1.80     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    1.81     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1.82     -e 's:$: $lt_compiler_flag:'`
    1.83 -   (eval echo "\"\$as_me:7668: $lt_compile\"" >&5)
    1.84 +   (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
    1.85     (eval "$lt_compile" 2>out/conftest.err)
    1.86     ac_status=$?
    1.87     cat out/conftest.err >&5
    1.88 -   echo "$as_me:7672: \$? = $ac_status" >&5
    1.89 +   echo "$as_me:7673: \$? = $ac_status" >&5
    1.90     if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1.91     then
    1.92       # The compiler can only warn and ignore the option if not recognized
    1.93 @@ -10423,7 +10424,7 @@
    1.94    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    1.95    lt_status=$lt_dlunknown
    1.96    cat > conftest.$ac_ext <<_LT_EOF
    1.97 -#line 10426 "configure"
    1.98 +#line 10427 "configure"
    1.99  #include "confdefs.h"
   1.100  
   1.101  #if HAVE_DLFCN_H
   1.102 @@ -10519,7 +10520,7 @@
   1.103    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   1.104    lt_status=$lt_dlunknown
   1.105    cat > conftest.$ac_ext <<_LT_EOF
   1.106 -#line 10522 "configure"
   1.107 +#line 10523 "configure"
   1.108  #include "confdefs.h"
   1.109  
   1.110  #if HAVE_DLFCN_H
   1.111 @@ -14201,11 +14202,11 @@
   1.112     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.113     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.114     -e 's:$: $lt_compiler_flag:'`
   1.115 -   (eval echo "\"\$as_me:14204: $lt_compile\"" >&5)
   1.116 +   (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
   1.117     (eval "$lt_compile" 2>conftest.err)
   1.118     ac_status=$?
   1.119     cat conftest.err >&5
   1.120 -   echo "$as_me:14208: \$? = $ac_status" >&5
   1.121 +   echo "$as_me:14209: \$? = $ac_status" >&5
   1.122     if (exit $ac_status) && test -s "$ac_outfile"; then
   1.123       # The compiler can only warn and ignore the option if not recognized
   1.124       # So say no if there are warnings other than the usual output.
   1.125 @@ -14300,11 +14301,11 @@
   1.126     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.127     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.128     -e 's:$: $lt_compiler_flag:'`
   1.129 -   (eval echo "\"\$as_me:14303: $lt_compile\"" >&5)
   1.130 +   (eval echo "\"\$as_me:14304: $lt_compile\"" >&5)
   1.131     (eval "$lt_compile" 2>out/conftest.err)
   1.132     ac_status=$?
   1.133     cat out/conftest.err >&5
   1.134 -   echo "$as_me:14307: \$? = $ac_status" >&5
   1.135 +   echo "$as_me:14308: \$? = $ac_status" >&5
   1.136     if (exit $ac_status) && test -s out/conftest2.$ac_objext
   1.137     then
   1.138       # The compiler can only warn and ignore the option if not recognized
   1.139 @@ -14352,11 +14353,11 @@
   1.140     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   1.141     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   1.142     -e 's:$: $lt_compiler_flag:'`
   1.143 -   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
   1.144 +   (eval echo "\"\$as_me:14356: $lt_compile\"" >&5)
   1.145     (eval "$lt_compile" 2>out/conftest.err)
   1.146     ac_status=$?
   1.147     cat out/conftest.err >&5
   1.148 -   echo "$as_me:14359: \$? = $ac_status" >&5
   1.149 +   echo "$as_me:14360: \$? = $ac_status" >&5
   1.150     if (exit $ac_status) && test -s out/conftest2.$ac_objext
   1.151     then
   1.152       # The compiler can only warn and ignore the option if not recognized
   1.153 @@ -23752,6 +23753,201 @@
   1.154      fi
   1.155  }
   1.156  
   1.157 +# Check whether --enable-video-opengles was given.
   1.158 +if test "${enable_video_opengles+set}" = set; then
   1.159 +  enableval=$enable_video_opengles;
   1.160 +else
   1.161 +  enable_video_opengles=yes
   1.162 +fi
   1.163 +
   1.164 +
   1.165 +CheckOpenGLESX11()
   1.166 +{
   1.167 +    if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
   1.168 +        { echo "$as_me:$LINENO: checking for OpenGL ES (EGL) support" >&5
   1.169 +echo $ECHO_N "checking for OpenGL ES (EGL) support... $ECHO_C" >&6; }
   1.170 +        video_opengles=no
   1.171 +        cat >conftest.$ac_ext <<_ACEOF
   1.172 +/* confdefs.h.  */
   1.173 +_ACEOF
   1.174 +cat confdefs.h >>conftest.$ac_ext
   1.175 +cat >>conftest.$ac_ext <<_ACEOF
   1.176 +/* end confdefs.h.  */
   1.177 +
   1.178 +         #include <EGL/egl.h>
   1.179 +
   1.180 +int
   1.181 +main ()
   1.182 +{
   1.183 +
   1.184 +
   1.185 +  ;
   1.186 +  return 0;
   1.187 +}
   1.188 +_ACEOF
   1.189 +rm -f conftest.$ac_objext
   1.190 +if { (ac_try="$ac_compile"
   1.191 +case "(($ac_try" in
   1.192 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.193 +  *) ac_try_echo=$ac_try;;
   1.194 +esac
   1.195 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.196 +  (eval "$ac_compile") 2>conftest.er1
   1.197 +  ac_status=$?
   1.198 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.199 +  rm -f conftest.er1
   1.200 +  cat conftest.err >&5
   1.201 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.202 +  (exit $ac_status); } && {
   1.203 +	 test -z "$ac_c_werror_flag" ||
   1.204 +	 test ! -s conftest.err
   1.205 +       } && test -s conftest.$ac_objext; then
   1.206 +
   1.207 +        video_opengles=yes
   1.208 +
   1.209 +else
   1.210 +  echo "$as_me: failed program was:" >&5
   1.211 +sed 's/^/| /' conftest.$ac_ext >&5
   1.212 +
   1.213 +
   1.214 +fi
   1.215 +
   1.216 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.217 +        { echo "$as_me:$LINENO: result: $video_opengles" >&5
   1.218 +echo "${ECHO_T}$video_opengles" >&6; }
   1.219 +        if test x$video_opengles = xyes; then
   1.220 +            { echo "$as_me:$LINENO: checking for OpenGL ES v1 headers" >&5
   1.221 +echo $ECHO_N "checking for OpenGL ES v1 headers... $ECHO_C" >&6; }
   1.222 +            video_opengles_v1=no
   1.223 +            cat >conftest.$ac_ext <<_ACEOF
   1.224 +/* confdefs.h.  */
   1.225 +_ACEOF
   1.226 +cat confdefs.h >>conftest.$ac_ext
   1.227 +cat >>conftest.$ac_ext <<_ACEOF
   1.228 +/* end confdefs.h.  */
   1.229 +
   1.230 +             #include <GLES/gl.h>
   1.231 +             #include <GLES/glext.h>
   1.232 +
   1.233 +int
   1.234 +main ()
   1.235 +{
   1.236 +
   1.237 +
   1.238 +  ;
   1.239 +  return 0;
   1.240 +}
   1.241 +_ACEOF
   1.242 +rm -f conftest.$ac_objext
   1.243 +if { (ac_try="$ac_compile"
   1.244 +case "(($ac_try" in
   1.245 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.246 +  *) ac_try_echo=$ac_try;;
   1.247 +esac
   1.248 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.249 +  (eval "$ac_compile") 2>conftest.er1
   1.250 +  ac_status=$?
   1.251 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.252 +  rm -f conftest.er1
   1.253 +  cat conftest.err >&5
   1.254 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.255 +  (exit $ac_status); } && {
   1.256 +	 test -z "$ac_c_werror_flag" ||
   1.257 +	 test ! -s conftest.err
   1.258 +       } && test -s conftest.$ac_objext; then
   1.259 +
   1.260 +            video_opengles_v1=yes
   1.261 +
   1.262 +else
   1.263 +  echo "$as_me: failed program was:" >&5
   1.264 +sed 's/^/| /' conftest.$ac_ext >&5
   1.265 +
   1.266 +
   1.267 +fi
   1.268 +
   1.269 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.270 +            { echo "$as_me:$LINENO: result: $video_opengles_v1" >&5
   1.271 +echo "${ECHO_T}$video_opengles_v1" >&6; }
   1.272 +            if test x$video_opengles_v1 = xyes; then
   1.273 +
   1.274 +cat >>confdefs.h <<\_ACEOF
   1.275 +#define SDL_VIDEO_OPENGL_ES 1
   1.276 +_ACEOF
   1.277 +
   1.278 +
   1.279 +cat >>confdefs.h <<\_ACEOF
   1.280 +#define SDL_VIDEO_RENDER_OGL_ES 1
   1.281 +_ACEOF
   1.282 +
   1.283 +            fi
   1.284 +            { echo "$as_me:$LINENO: checking for OpenGL ES v2 headers" >&5
   1.285 +echo $ECHO_N "checking for OpenGL ES v2 headers... $ECHO_C" >&6; }
   1.286 +            video_opengles_v2=no
   1.287 +            cat >conftest.$ac_ext <<_ACEOF
   1.288 +/* confdefs.h.  */
   1.289 +_ACEOF
   1.290 +cat confdefs.h >>conftest.$ac_ext
   1.291 +cat >>conftest.$ac_ext <<_ACEOF
   1.292 +/* end confdefs.h.  */
   1.293 +
   1.294 +             #include <GLES2/gl2.h>
   1.295 +             #include <GLES2/gl2ext.h>
   1.296 +
   1.297 +int
   1.298 +main ()
   1.299 +{
   1.300 +
   1.301 +
   1.302 +  ;
   1.303 +  return 0;
   1.304 +}
   1.305 +_ACEOF
   1.306 +rm -f conftest.$ac_objext
   1.307 +if { (ac_try="$ac_compile"
   1.308 +case "(($ac_try" in
   1.309 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   1.310 +  *) ac_try_echo=$ac_try;;
   1.311 +esac
   1.312 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   1.313 +  (eval "$ac_compile") 2>conftest.er1
   1.314 +  ac_status=$?
   1.315 +  grep -v '^ *+' conftest.er1 >conftest.err
   1.316 +  rm -f conftest.er1
   1.317 +  cat conftest.err >&5
   1.318 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.319 +  (exit $ac_status); } && {
   1.320 +	 test -z "$ac_c_werror_flag" ||
   1.321 +	 test ! -s conftest.err
   1.322 +       } && test -s conftest.$ac_objext; then
   1.323 +
   1.324 +            video_opengles_v2=yes
   1.325 +
   1.326 +else
   1.327 +  echo "$as_me: failed program was:" >&5
   1.328 +sed 's/^/| /' conftest.$ac_ext >&5
   1.329 +
   1.330 +
   1.331 +fi
   1.332 +
   1.333 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.334 +            { echo "$as_me:$LINENO: result: $video_opengles_v2" >&5
   1.335 +echo "${ECHO_T}$video_opengles_v2" >&6; }
   1.336 +            if test x$video_opengles_v2 = xyes; then
   1.337 +
   1.338 +cat >>confdefs.h <<\_ACEOF
   1.339 +#define SDL_VIDEO_OPENGL_ES2 1
   1.340 +_ACEOF
   1.341 +
   1.342 +
   1.343 +cat >>confdefs.h <<\_ACEOF
   1.344 +#define SDL_VIDEO_RENDER_OGL_ES2 1
   1.345 +_ACEOF
   1.346 +
   1.347 +            fi
   1.348 +        fi
   1.349 +    fi
   1.350 +}
   1.351 +
   1.352  CheckWINDOWSGL()
   1.353  {
   1.354      if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
   1.355 @@ -27000,6 +27196,7 @@
   1.356          CheckDirectFB
   1.357          CheckFusionSound
   1.358          CheckOpenGLX11
   1.359 +        CheckOpenGLESX11
   1.360          CheckInputEvents
   1.361          CheckTslib
   1.362          CheckUSBHID