comparison configure.in @ 1191:2bd4cec0de63

Seperate glX from HAVE_OPENGL, for platforms that have both an X server and a more official way to do OpenGL, explicitly check for glX on Mac OS X, and use SDL_LoadObject for platforms that have glX but don't have dlopen().
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 23 Nov 2005 11:46:36 +0000
parents 19d8949b4584
children 3bafdbba8dcf
comparison
equal deleted inserted replaced
1190:173c063d4f55 1191:2bd4cec0de63
1101 AC_ARG_ENABLE(video-opengl, 1101 AC_ARG_ENABLE(video-opengl,
1102 [ --enable-video-opengl include OpenGL context creation [default=yes]], 1102 [ --enable-video-opengl include OpenGL context creation [default=yes]],
1103 , enable_video_opengl=yes) 1103 , enable_video_opengl=yes)
1104 1104
1105 dnl Find OpenGL 1105 dnl Find OpenGL
1106 CheckOpenGL() 1106 CheckOpenGLX11()
1107 { 1107 {
1108 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 1108 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
1109 AC_MSG_CHECKING(for OpenGL (GLX) support) 1109 AC_MSG_CHECKING(for OpenGL (GLX) support)
1110 video_opengl=no 1110 video_opengl=no
1111 AC_TRY_COMPILE([ 1111 AC_TRY_COMPILE([
1116 ],[ 1116 ],[
1117 video_opengl=yes 1117 video_opengl=yes
1118 ]) 1118 ])
1119 AC_MSG_RESULT($video_opengl) 1119 AC_MSG_RESULT($video_opengl)
1120 if test x$video_opengl = xyes; then 1120 if test x$video_opengl = xyes; then
1121 CFLAGS="$CFLAGS -DHAVE_OPENGL" 1121 CFLAGS="$CFLAGS -DHAVE_OPENGL -DHAVE_OPENGL_X11"
1122 if test x$have_loadso != xyes; then 1122 if test x$have_loadso != xyes; then
1123 AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl") 1123 AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
1124 fi 1124 fi
1125 fi 1125 fi
1126 fi 1126 fi
2074 CheckGGI 2074 CheckGGI
2075 CheckSVGA 2075 CheckSVGA
2076 CheckAAlib 2076 CheckAAlib
2077 CheckQtopia 2077 CheckQtopia
2078 CheckPicoGUI 2078 CheckPicoGUI
2079 CheckOpenGL 2079 CheckOpenGLX11
2080 CheckInputEvents 2080 CheckInputEvents
2081 CheckPTHREAD 2081 CheckPTHREAD
2082 CheckSIGACTION 2082 CheckSIGACTION
2083 CheckAltivec 2083 CheckAltivec
2084 CheckLinuxVersion 2084 CheckLinuxVersion
2155 CheckNAS 2155 CheckNAS
2156 CheckX11 2156 CheckX11
2157 CheckDGA 2157 CheckDGA
2158 CheckSVGA 2158 CheckSVGA
2159 CheckAAlib 2159 CheckAAlib
2160 CheckOpenGL 2160 CheckOpenGLX11
2161 CheckPTHREAD 2161 CheckPTHREAD
2162 CheckSIGACTION 2162 CheckSIGACTION
2163 CheckRPATH 2163 CheckRPATH
2164 # Set up files for the audio library 2164 # Set up files for the audio library
2165 # We use the OSS and ALSA API's, not the Sun audio API 2165 # We use the OSS and ALSA API's, not the Sun audio API
2201 CheckNAS 2201 CheckNAS
2202 CheckX11 2202 CheckX11
2203 CheckDGA 2203 CheckDGA
2204 CheckSVGA 2204 CheckSVGA
2205 CheckAAlib 2205 CheckAAlib
2206 CheckOpenGL 2206 CheckOpenGLX11
2207 CheckPTHREAD 2207 CheckPTHREAD
2208 CheckSIGACTION 2208 CheckSIGACTION
2209 CheckUSBHID 2209 CheckUSBHID
2210 CheckRPATH 2210 CheckRPATH
2211 # Set up files for the audio library 2211 # Set up files for the audio library
2240 CheckESD 2240 CheckESD
2241 CheckNAS 2241 CheckNAS
2242 CheckX11 2242 CheckX11
2243 CheckAAlib 2243 CheckAAlib
2244 CheckWscons 2244 CheckWscons
2245 CheckOpenGL 2245 CheckOpenGLX11
2246 CheckPTHREAD 2246 CheckPTHREAD
2247 CheckSIGACTION 2247 CheckSIGACTION
2248 CheckUSBHID 2248 CheckUSBHID
2249 CheckRPATH 2249 CheckRPATH
2250 # Set up files for the audio library 2250 # Set up files for the audio library
2282 CheckARTSC 2282 CheckARTSC
2283 CheckESD 2283 CheckESD
2284 CheckNAS 2284 CheckNAS
2285 CheckX11 2285 CheckX11
2286 CheckAAlib 2286 CheckAAlib
2287 CheckOpenGL 2287 CheckOpenGLX11
2288 CheckPTHREAD 2288 CheckPTHREAD
2289 CheckSIGACTION 2289 CheckSIGACTION
2290 CheckUSBHID 2290 CheckUSBHID
2291 CheckRPATH 2291 CheckRPATH
2292 # Set up files for the audio library 2292 # Set up files for the audio library
2325 CheckARTSC 2325 CheckARTSC
2326 CheckESD 2326 CheckESD
2327 CheckNAS 2327 CheckNAS
2328 CheckX11 2328 CheckX11
2329 CheckAAlib 2329 CheckAAlib
2330 CheckOpenGL 2330 CheckOpenGLX11
2331 CheckPTHREAD 2331 CheckPTHREAD
2332 CheckSIGACTION 2332 CheckSIGACTION
2333 CheckRPATH 2333 CheckRPATH
2334 # Set up files for the audio library 2334 # Set up files for the audio library
2335 if test x$enable_audio = xyes; then 2335 if test x$enable_audio = xyes; then
2368 CheckARTSC 2368 CheckARTSC
2369 CheckESD 2369 CheckESD
2370 CheckNAS 2370 CheckNAS
2371 CheckX11 2371 CheckX11
2372 CheckAAlib 2372 CheckAAlib
2373 CheckOpenGL 2373 CheckOpenGLX11
2374 CheckPTHREAD 2374 CheckPTHREAD
2375 CheckSIGACTION 2375 CheckSIGACTION
2376 CheckRPATH 2376 CheckRPATH
2377 # Set up files for the audio library 2377 # Set up files for the audio library
2378 if test x$enable_audio = xyes; then 2378 if test x$enable_audio = xyes; then
2408 CheckDMEDIA 2408 CheckDMEDIA
2409 CheckESD 2409 CheckESD
2410 CheckNAS 2410 CheckNAS
2411 CheckX11 2411 CheckX11
2412 CheckAAlib 2412 CheckAAlib
2413 CheckOpenGL 2413 CheckOpenGLX11
2414 CheckPTHREAD 2414 CheckPTHREAD
2415 CheckSIGACTION 2415 CheckSIGACTION
2416 # We use the dmedia audio API, not the Sun audio API 2416 # We use the dmedia audio API, not the Sun audio API
2417 #if test x$enable_audio = xyes; then 2417 #if test x$enable_audio = xyes; then
2418 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2418 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2459 CheckOSS 2459 CheckOSS
2460 CheckNAS 2460 CheckNAS
2461 CheckX11 2461 CheckX11
2462 CheckGGI 2462 CheckGGI
2463 CheckAAlib 2463 CheckAAlib
2464 CheckOpenGL 2464 CheckOpenGLX11
2465 CheckPTHREAD 2465 CheckPTHREAD
2466 CheckSIGACTION 2466 CheckSIGACTION
2467 # Set up files for the audio library 2467 # Set up files for the audio library
2468 if test x$enable_audio = xyes; then 2468 if test x$enable_audio = xyes; then
2469 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2469 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2499 CheckOSS 2499 CheckOSS
2500 CheckNAS 2500 CheckNAS
2501 CheckX11 2501 CheckX11
2502 CheckGGI 2502 CheckGGI
2503 CheckAAlib 2503 CheckAAlib
2504 CheckOpenGL 2504 CheckOpenGLX11
2505 CheckPTHREAD 2505 CheckPTHREAD
2506 CheckSIGACTION 2506 CheckSIGACTION
2507 # Set up files for the audio library 2507 # Set up files for the audio library
2508 if test x$enable_audio = xyes; then 2508 if test x$enable_audio = xyes; then
2509 AUDIO_SUBDIRS="$AUDIO_SUBDIRS paudio" 2509 AUDIO_SUBDIRS="$AUDIO_SUBDIRS paudio"
2536 CheckDLOPEN 2536 CheckDLOPEN
2537 CheckNAS 2537 CheckNAS
2538 CheckX11 2538 CheckX11
2539 CheckGGI 2539 CheckGGI
2540 CheckAAlib 2540 CheckAAlib
2541 CheckOpenGL 2541 CheckOpenGLX11
2542 CheckPTHREAD 2542 CheckPTHREAD
2543 CheckSIGACTION 2543 CheckSIGACTION
2544 # Set up files for the audio library 2544 # Set up files for the audio library
2545 if test x$enable_audio = xyes; then 2545 if test x$enable_audio = xyes; then
2546 CFLAGS="$CFLAGS -I/usr/include/mme -DMMEAUDIO_SUPPORT" 2546 CFLAGS="$CFLAGS -I/usr/include/mme -DMMEAUDIO_SUPPORT"
2576 # CheckNASM 2576 # CheckNASM
2577 CheckDLOPEN 2577 CheckDLOPEN
2578 CheckNAS 2578 CheckNAS
2579 CheckPHOTON 2579 CheckPHOTON
2580 CheckX11 2580 CheckX11
2581 CheckOpenGL 2581 CheckOpenGLX11
2582 CheckPTHREAD 2582 CheckPTHREAD
2583 CheckSIGACTION 2583 CheckSIGACTION
2584 # Set up files for the audio library 2584 # Set up files for the audio library
2585 if test x$enable_audio = xyes; then 2585 if test x$enable_audio = xyes; then
2586 CFLAGS="$CFLAGS -DQNXNTOAUDIO_SUPPORT" 2586 CFLAGS="$CFLAGS -DQNXNTOAUDIO_SUPPORT"
2769 CheckDiskAudio 2769 CheckDiskAudio
2770 CheckCOCOA 2770 CheckCOCOA
2771 CheckCARBON 2771 CheckCARBON
2772 CheckX11 2772 CheckX11
2773 CheckMacGL 2773 CheckMacGL
2774 CheckOpenGLX11
2774 CheckPTHREAD 2775 CheckPTHREAD
2775 CheckSIGACTION 2776 CheckSIGACTION
2776 CheckAltivec 2777 CheckAltivec
2777 # If either the audio or CD driver is used, add the AudioUnit framework 2778 # If either the audio or CD driver is used, add the AudioUnit framework
2778 if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then 2779 if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then