From 174abfc85ddc0220efecd4b7cda27816ef999c10 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Wed, 9 Oct 2002 05:13:38 +0000 Subject: configure.ac: - OpenGL header GL/gl.h is checked to see if its exists with wrong header name (GL/GL.h). Test failed despite the file required by src/video_out/video_out_opengl.c was GL/gl.h - Ascii-Art library version incorrect. Required version is 1.4 (contains aalib-config) m4/aa.m4: - Changed aalib version to 1.4 src/audio_out/Makefile.am: src/demuxers/Makefile.am: src/dxr3/Makefile.am: src/input/Makefile.am: src/input/libdvdnav/Makefile.am: src/input/libdvdread/Makefile.am: src/libffmpeg/libavcodec/Makefile.am: src/libffmpeg/libavcodec/i386/Makefile.am: src/libffmpeg/libavcodec/mlib/Makefile.am: src/libmad/Makefile.am: src/libmpeg2/Makefile.am: src/libvorbis/Makefile.am: src/libw32dll/Makefile.am: src/libw32dll/wine/Makefile.am: src/libxineadec/Makefile.am: src/libxvid/Makefile.am: src/video_out/Makefile.am: src/video_out/libdha/Makefile.am: src/video_out/vidix/Makefile.am: src/xine-engine/Makefile.am: src/xine-utils/Makefile.am: - Removed @CFLAGS@ from all AM_CFLAGS. @CFLAGS@ are added in Makefile.in. Adding it here was redundant. Thanks to Mike and others for pointing this out. CVS patchset: 2805 CVS date: 2002/10/09 05:13:38 --- src/demuxers/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/demuxers') diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 2795c3d50..b2e972e4c 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @CFLAGS@ $(OGG_CFLAGS) +AM_CFLAGS = $(OGG_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -70,7 +70,6 @@ xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module xineplug_dmx_qt_la_SOURCES = demux_qt.c qtpalette.h xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module -xineplug_dmx_qt_la_LIBADD = -lz $(top_builddir)/src/xine-engine/libxine.la xineplug_dmx_asf_la_SOURCES = demux_asf.c xineplug_dmx_asf_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la -- cgit v1.2.3