[xine-cvs] CVS: xine-lib acconfig.h,1.26,1.27 configure.in,1.135,1.136

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-lib
In directory usw-pr-cvs1:/tmp/cvs-serv1885

Modified Files:
	acconfig.h configure.in 
Log Message:
Change/fix opengl checks, add a glut fallback (GLU).


Index: acconfig.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/acconfig.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- acconfig.h	2002/01/23 15:05:46	1.26
+++ acconfig.h	2002/01/23 23:27:10	1.27
@@ -66,6 +66,9 @@
 /* Define this if you have GLut support available */
 #undef HAVE_GLUT
 
+/* Define this if you have GLU support available */
+#undef HAVE_GLU
+
 /* Define this if you have libXinerama installed */
 #undef HAVE_XINERAMA
 

Index: configure.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- configure.in	2002/01/23 15:05:46	1.135
+++ configure.in	2002/01/23 23:27:10	1.136
@@ -241,21 +241,32 @@
 
 
 dnl
-dnl Check for OpenGL & GLut
+dnl Check for OpenGL & [GLut | GLU]
 dnl
 AC_CHECK_LIB(GL, glBegin,
-             OPENGL_LIBS="-lGL"
-             ac_have_opengl="yes",,
-             -lGL)
+             [ ac_have_opengl="yes"
+               OPENGL_LIBS="-lGL" 
+	       AC_CHECK_LIB(glut, glutInit, dnl check for glut
+	                    [ ac_have_glut="yes"
+                              GLUT_LIBS="-lglut"
+	                      AC_DEFINE(HAVE_GLUT)
+			      AC_DEFINE(HAVE_OPENGL) ],
+	                    [ ac_have_glut="no" dnl fallback, check for GLU
+	                      AC_CHECK_LIB(GLU, gluPerspective,
+		                           [ ac_have_glu="yes"
+                                             GLU_LIBS="-lGLU" 
+		                             AC_DEFINE(HAVE_GLU)
+					     AC_DEFINE(HAVE_OPENGL) ],
+	                                   [ ac_have_glu="no" ], 
+                                           [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU $X_EXTRA_LIBS])], 
+	                    [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS])
+             ],
+	     [],
+             [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
 AC_SUBST(OPENGL_LIBS)
-AM_CONDITIONAL(HAVE_OPENGL, test x$ac_have_opengl = "xyes")
-
-AC_CHECK_LIB(glut, glutInit,
-             GLUT_LIBS="-lglut"
-             ac_have_glut="yes",,
-             -lglut)
 AC_SUBST(GLUT_LIBS)
-AM_CONDITIONAL(HAVE_GLUT, test x$ac_have_glut = "xyes")
+AC_SUBST(GLU_LIBS)
+AM_CONDITIONAL(HAVE_OPENGL, [ test x$ac_have_opengl = "xyes" -a x$ac_have_glut="xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu="xyes" ] )
 
 
 
@@ -921,6 +932,10 @@
     else
       echo "   - Xv (XVideo *shared*)"
     fi
+  fi
+  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	
+    echo "   - OpenGL"
   fi
 fi
 if test x$no_aalib != "xyes"; then