[Mplayer-cvslog] CVS: main configure,1.767,1.768

Moritz Bunkus CVS mosu at mplayerhq.hu
Fri Sep 12 23:59:45 CEST 2003


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

Modified Files:
	configure 
Log Message:
Fix for the faad2 compilation test which needs config.h to be present. Patch by Bernd Ernesti <mplayer at lists.veego.de>.

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- configure	12 Sep 2003 15:52:57 -0000	1.767
+++ configure	12 Sep 2003 21:59:40 -0000	1.768
@@ -4309,6 +4309,13 @@
 else
   _inc_faad="-I`pwd`/libfaad2"
   _faad=yes
+  # the faad check needs a config.h file
+  if test -f "config.h" ; then
+    _rm_config_h=no
+  else
+    _rm_config_h=yes
+    echo "" > config.h
+  fi
   # internal faad: check if our dear gcc is able to compile it...
   echo "$_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra `pwd`/libfaad2/cfft.c -o $TMPO" >> "$TMPLOG"
   if ( $_cc -c -O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $CFLAGS $_inc_faad $_inc_extra "`pwd`/libfaad2/cfft.c" -o "$TMPO" ) >> "$TMPLOG" 2>&1 ; then
@@ -4316,6 +4323,10 @@
   else
     _faad=no
     echores "no (broken gcc)"
+  fi
+  # remove a temporarily config.h, which was needed for the faad compile check
+  if test "$_rm_config_h" = yes; then
+    rm config.h
   fi
 fi
 fi



More information about the MPlayer-cvslog mailing list