[xine-cvs] CVS: xine-lib/m4 opengl.m4,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/xine/xine-lib/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19347

Modified Files:
	opengl.m4 
Log Message:
Use X11-based rather than 'native' OpenGL interface on Mac OS X for standard OpenGL support



Index: opengl.m4
===================================================================
RCS file: /cvsroot/xine/xine-lib/m4/opengl.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl.m4	26 Aug 2004 17:57:53 -0000	1.1
+++ opengl.m4	24 Nov 2004 16:29:32 -0000	1.2
@@ -12,48 +12,39 @@
   )
 
   if test x$enableopengl = "xyes"; then
-    case "$host" in
-      *darwin*) dnl Use native interface
-          OPENGL_LIBS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit"
-          OPENGL_CFLAGS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit"
-          ac_use_opengl="yes"
-          ;;
-      *)
-        AC_CHECK_LIB(GL, glBegin,
-         [AC_CHECK_HEADER(GL/gl.h,
-           [ac_have_opengl="yes"
-            OPENGL_LIBS="-lGL"
-            dnl check for glut
-            AC_CHECK_LIB(glut, glutInit,
-             [ac_have_glut="yes"
-              GLUT_LIBS="-lglut"
-              AC_DEFINE(HAVE_GLUT,1,[Define this if you have GLut support available])
-              AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
-             ],
-             [ac_have_glut="no"
-              dnl fallback, check for GLU
-              AC_CHECK_LIB(GLU, gluPerspective,
-               [ac_have_glu="yes"
-                GLU_LIBS="-lGLU -lm" 
-                AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available])
-                AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
-               ],
-               [ac_have_glu="no"], 
-               [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS]
-              )
-             ], 
-             [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS]
-            )
-           ]
-         )],
-         [],
-         [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]
+    AC_CHECK_LIB(GL, glBegin,
+     [AC_CHECK_HEADER(GL/gl.h,
+       [ac_have_opengl="yes"
+        OPENGL_LIBS="-lGL"
+        dnl check for glut
+        AC_CHECK_LIB(glut, glutInit,
+         [ac_have_glut="yes"
+          GLUT_LIBS="-lglut"
+          AC_DEFINE(HAVE_GLUT,1,[Define this if you have GLut support available])
+          AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
+         ],
+         [ac_have_glut="no"
+          dnl fallback, check for GLU
+          AC_CHECK_LIB(GLU, gluPerspective,
+           [ac_have_glu="yes"
+            GLU_LIBS="-lGLU -lm" 
+            AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available])
+            AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
+           ],
+           [ac_have_glu="no"], 
+           [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS]
+          )
+         ], 
+         [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS]
         )
-        if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then
-          ac_use_opengl=yes
-        fi
-        ;;
-    esac
+       ]
+     )],
+     [],
+     [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]
+    )
+    if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then
+      ac_use_opengl=yes
+    fi
   fi
 
   AC_SUBST(OPENGL_CFLAGS)