[packages/xine-lib.git] / xine-lib-automake_as.patch

--- xine-lib-1-beta0/configure.ac.orig	Wed Dec 11 14:01:41 2002
+++ xine-lib-1-beta0/configure.ac	Sat Dec 14 20:55:28 2002
@@ -283,7 +283,6 @@
 dnl Check for OpenGL & [GLut | GLU]
 dnl ---------------------------------------------
 AC_CHECK_LIB(GL, glBegin,
-	[AC_CHECK_HEADER(GL/gl.h,
              [ ac_have_opengl="yes"
                OPENGL_LIBS="-lGL" 
 	       AC_CHECK_LIB(glut, glutInit, dnl check for glut
@@ -301,9 +300,8 @@
                                            [$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])
+	     [],
+             [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(GLUT_LIBS)
 AC_SUBST(GLU_LIBS)
Commit	Line	Data
e033c21b	1	--- xine-lib-1-beta0/configure.ac.orig Wed Dec 11 14:01:41 2002
	2	+++ xine-lib-1-beta0/configure.ac Sat Dec 14 20:55:28 2002
	3	@@ -283,7 +283,6 @@
a0ea3619	4	dnl Check for OpenGL & [GLut \| GLU]
e033c21b	5	dnl ---------------------------------------------
a0ea3619	6	AC_CHECK_LIB(GL, glBegin,
e033c21b	7	- [AC_CHECK_HEADER(GL/gl.h,
a0ea3619	8	[ ac_have_opengl="yes"
	9	OPENGL_LIBS="-lGL"
	10	AC_CHECK_LIB(glut, glutInit, dnl check for glut
e033c21b	11	@@ -301,9 +300,8 @@
a0ea3619	12	[$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS])],
	13	[$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS])
	14	],
	15	- [])],
	16	- [],
	17	- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
	18	+ [],
	19	+ [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS])
	20	AC_SUBST(OPENGL_LIBS)
	21	AC_SUBST(GLUT_LIBS)
	22	AC_SUBST(GLU_LIBS)