[Mplayer-cvslog] CVS: main configure,1.789,1.790

Alex Beregszaszi alex at mplayerhq.hu
Wed Oct 22 14:35:49 CEST 2003


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

Modified Files:
	configure 
Log Message:
Support for newer Apple GCC's. Patch by Magnus Damm <damm at opensource.se>

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- configure	19 Oct 2003 20:37:07 -0000	1.789
+++ configure	22 Oct 2003 12:35:03 -0000	1.790
@@ -1639,11 +1639,15 @@
         FSF_flags='-maltivec -mabi=altivec'
         Darwin_flags='-faltivec'
 
+        # check for Darwin-style flags first, since
+        # gcc-3.3 (August Update from Apple) on MacOS 10.2.8
+        # accepts but ignores FSF-style flags...
+
         if test -z "$p"; then
-            cc_check $FSF_flags && p='FSF'
+            cc_check $Darwin_flags && p='Darwin'
         fi
         if test -z "$p"; then
-            cc_check $Darwin_flags && p='Darwin'
+            cc_check $FSF_flags && p='FSF'
         fi
 
         case $p in
@@ -1664,7 +1668,6 @@
     # check if <altivec.h> should be included
 
     _def_altivec_h='#undef HAVE_ALTIVEC_H'
-    _def_altivec='#undef HAVE_ALTIVEC'
 
     if test "$_altivec" = yes ; then
         echocheck "altivec.h"
@@ -1676,7 +1679,6 @@
          cc_check $_altivec_gcc_flags && _have_altivec_h=yes
          if test "$_have_altivec_h" = yes ; then
              _def_altivec_h='#define HAVE_ALTIVEC_H 1'
-             _def_altivec='#define HAVE_ALTIVEC 1'
          fi
          echores "$_have_altivec_h"
     fi
@@ -1699,6 +1701,14 @@
 
     if test "$_altivec" = yes ; then
         _mcpu="$_mcpu $_altivec_gcc_flags"
+    fi
+
+    # setup _def_altivec correctly
+
+    if test "$_altivec" = yes ; then
+	_def_altivec='#define HAVE_ALTIVEC 1'
+    else
+	_def_altivec='#undef HAVE_ALTIVEC'
     fi
 fi
 



More information about the MPlayer-cvslog mailing list