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 --- m4/aa.m4 | 2 +- m4/as.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'm4') diff --git a/m4/aa.m4 b/m4/aa.m4 index 7493f823e..b12e38071 100644 --- a/m4/aa.m4 +++ b/m4/aa.m4 @@ -60,7 +60,7 @@ AC_ARG_ENABLE(aalibtest, fi fi - min_aalib_version=ifelse([$1], ,1.2,$1) + min_aalib_version=ifelse([$1], ,1.4,$1) if test x"$enable_aalibtest" != "xyes"; then AC_MSG_CHECKING([for AALIB version >= $min_aalib_version]) diff --git a/m4/as.m4 b/m4/as.m4 index 7ead0e25c..fa12f18f8 100644 --- a/m4/as.m4 +++ b/m4/as.m4 @@ -7,7 +7,7 @@ dnl Daniel Caujolle-Bert AC_DEFUN([AM_PROG_AS_MOD], [# By default we simply use the C compiler to build assembly code. AC_REQUIRE([AC_PROG_CC]) -: ${CCAS='$CC'} +: ${CCAS='$(CC)'} # Set CCASFLAGS if not already set. : ${CCASFLAGS='$(CFLAGS)'} # Set ASCOMPILE if not already set. -- cgit v1.2.3