From 892ee3299e62ca117d3f26575218eb2a723542d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 18 Dec 2007 09:26:42 +0000 Subject: Makefile.am: Include common/win32.mak for CRLF check of win32 project files (see #393626). Original commit message from CVS: * Makefile.am: Include common/win32.mak for CRLF check of win32 project files (see #393626). * configure.ac: Bump requirements to -base CVS for libgstvideo additions in glimagesink. Disable glimagesink until the missing files get checked in. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 695a7779..bea69902 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,8 @@ AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** dnl *** remove rtpmanager/equalizer stuff below when this is updated -GST_REQ=0.10.14.1 -GSTPB_REQ=0.10.14.1 +GST_REQ=0.10.15.1 +GSTPB_REQ=0.10.15.1 dnl *** autotools stuff **** @@ -294,6 +294,8 @@ LIBS="$LIBS $X_LIBS" AG_GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") + dnl disable until the build gets fixed + HAVE_OPENGL="no" ]) CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" -- cgit v1.2.1