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

3 files changed, 13 insertions, 11 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 86769e5ae..8e7a246de 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -3,11 +3,13 @@ SUBDIRS = libdha vidix
 VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
 	-I$(top_srcdir)/src/video_out/vidix
 
-CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
-	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
+	$(AALIB_CFLAGS)
 
 DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
-	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
+	$(AALIB_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -77,28 +79,28 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 #xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \
 #	$(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
 #xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module
-#
+
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
 xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
 xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_fb.c
 #xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
 #xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
 #xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
 #xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
 #xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
 #xineplug_vo_out_vidix_la_LIBADD =  $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
 #xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 79d9617c5..11ca3ef3c 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = README pci_db2c.awk
 
 SUBDIRS = bin kernelhelper oth sysdep
 
-CFLAGS = @CFLAGS@ @STATIC@
+AM_CFLAGS = @STATIC@
 
 if HAVE_VIDIX
 dha_lib = libdha.la
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index f89457457..67a0aa373 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = README vidix.txt
 
 SUBDIRS = drivers
 
-CFLAGS = @CFLAGS@ @STATIC@
+AM_CFLAGS = @STATIC@
 
 if HAVE_VIDIX
 vidix_lib = libvidix.la