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.
This commit is contained in:
Tim-Philipp Müller 2007-12-18 09:26:42 +00:00
parent 4625e68226
commit 892ee3299e
3 changed files with 17 additions and 6 deletions

View file

@ -1,3 +1,14 @@
2007-12-18 Tim-Philipp Müller <tim at centricular dot net>
* 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.
2007-12-17 David Schleef <ds@schleef.org>
* sys/glsink/Makefile.am:

View file

@ -16,10 +16,8 @@ DIST_SUBDIRS = \
m4 common docs tests po \
examples
win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
debug:
echo $(win32)
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak
EXTRA_DIST = \
gst-plugins-bad.spec depcomp \

View file

@ -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"