[Mplayer-cvslog] CVS: main Makefile,1.273,1.274 configure,1.755,1.756

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv840

Modified Files:
	Makefile configure 
Log Message:
use internal (included) libfaad2


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- Makefile	17 Aug 2003 20:56:10 -0000	1.273
+++ Makefile	30 Aug 2003 22:31:41 -0000	1.274
@@ -36,11 +36,11 @@
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libfaad2/libfaad2.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) # -Wall
 
-PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
+PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf libfaad2
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
@@ -72,7 +72,7 @@
 ALL_PRG += $(PRG_FIBMAP)
 endif
 
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a libfaad2/libfaad2.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@@ -148,6 +148,9 @@
 
 liba52/liba52.a:
 	$(MAKE) -C liba52
+
+libfaad2/libfaad2.a:
+	$(MAKE) -C libfaad2
 
 mp3lib/libMP3.a:
 	$(MAKE) -C mp3lib

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- configure	24 Aug 2003 18:26:08 -0000	1.755
+++ configure	30 Aug 2003 22:31:41 -0000	1.756
@@ -1077,7 +1077,7 @@
 _theora=auto
 _matroska=auto
 _tremor=no
-_faad=auto
+_faad=yes
 _xmms=no
 _css=auto
 # dvdnav disabled, it does not work
@@ -4279,17 +4279,18 @@
 
 
 echocheck "faad2 (AAC) support"
-if test "$_faad" = auto ; then
-  _faad=no
-  cat > $TMPC << EOF
-#include <faad.h>
-int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); return 0; }
-EOF
-  cc_check -lfaad -lm && _faad=yes
-fi
+#if test "$_faad" = auto ; then
+#  _faad=no
+#  cat > $TMPC << EOF
+##include <faad.h>
+#int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; testhand = faacDecOpen(); return 0; }
+#EOF
+#  cc_check -lfaad -lm && _faad=yes
+#fi
 if test "$_faad" = yes ; then
   _def_faad='#define HAVE_FAAD 1'
-  _ld_faad='-lfaad'
+  _inc_faad="-I`pwd`"
+#  _ld_faad='-lfaad'
   _codecmodules="faad2 $_codecmodules"
 else
   _def_faad='#undef HAVE_FAAD'
@@ -4298,7 +4299,8 @@
 
 if test "$_faad" = yes; then
 cat > $TMPC <<EOF
-#include <faad.h>
+//#include <faad.h>
+#include "libfaad2/faad.h"
 #ifndef FAAD_MIN_STREAMSIZE
 #error Too old version
 #endif
@@ -4311,7 +4313,7 @@
   return 0;
 }
 EOF
-  if cc_check $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then
+  if cc_check $_inc_faad $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then
     _faad_version=`"$TMPO"`
     _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/'`
     _def_faad_version="#define FAADVERSION $_faad_tempversion"