[MPlayer-cvslog] CVS: main configure,1.1002,1.1003

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14432

Modified Files:
	configure 
Log Message:
Make FAAC detection follow standard enable/disable/auto semantics.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -r1.1002 -r1.1003
--- configure	11 May 2005 16:00:07 -0000	1.1002
+++ configure	14 May 2005 10:14:48 -0000	1.1003
@@ -1549,6 +1549,7 @@
   --disable-internal-faad)	_faad_internal=no	;;
   --enable-external-faad)	_faad_external=yes	_faad_internal=no	;;
   --disable-external-faad)	_faad_external=no	;;
+  --enable-faac)	_faac=yes	;;
   --disable-faac)	_faac=no	;;
   --enable-ladspa)	_ladspa=yes	;;
   --disable-ladspa)	_ladspa=no		;;
@@ -5420,20 +5421,17 @@
 EOF
   if ( cc_check -c -O4 -lfaac $_ld_lm ); then
     _faac=yes
-    _ld_faac="-lfaac"
+  elif ( cc_check -c -O4 -lfaac -lmp4v2 -lstdc++ $_ld_lm ); then
+    _faac=yes
+    _ld_faac="-lmp4v2 -lstdc++"
   else
-    if ( cc_check -c -O4 -lfaac -lmp4v2 -lstdc++ $_ld_lm ); then
-      _faac=yes
-      _ld_faac="-lfaac -lmp4v2 -lstdc++"
-    else
-      _faac=no
-      _ld_faac=""
-    fi
+    _faac=no
   fi
 fi
 if test "$_faac" = yes ; then
   _def_faac="#define HAVE_FAAC 1"
   _codecmodules="$_codecmodules faac"
+  _ld_faac="-lfaac $_ld_faac"
 else
   _def_faac="#undef HAVE_FAAC"
   _nocodecmodules="$_nocodecmodules faac"