--- trunk/xvidcore/build/generic/configure.in	2008/12/04 18:30:36	1845
+++ trunk/xvidcore/build/generic/configure.in	2009/06/09 07:48:57	1875
@@ -16,7 +16,7 @@
 API_MINOR="3"
 
 dnl NASM/YASM version requirement
-minimum_yasm_minor_version=7
+minimum_yasm_minor_version=8
 minimum_nasm_minor_version=0
 minimum_nasm_major_version=2
 nasm_prog="nasm"
@@ -264,6 +264,7 @@
 AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)
 SPECIFIC_LDFLAGS=""
 SPECIFIC_CFLAGS=""
+ALTIVEC_CFLAGS=""
 PRE_SHARED_LIB=""
 case "$target_os" in
      linux*|solaris*)
@@ -293,7 +294,7 @@
 	if test x"$macosx_module" = x"no"; then
 	   AC_MSG_RESULT([dylib options])
 	   SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
-	   SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
+	   SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
 	else 
 	   AC_MSG_RESULT([module options])
  	   PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
@@ -360,7 +361,7 @@
        fi
        AC_MSG_RESULT([$yasm_minor])
 
-       dnl Actually, yasm >= 0.6.2 should be ok
+       dnl Actually, yasm >= 0.7.99.2161 should be ok
        dnl But I'm too lazy to check also the patch version...
        if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
          AC_MSG_WARN([yasm version is too old])
@@ -455,7 +456,7 @@
 dnl and GNU gcc with very slight changes to code which can be sumed up by:
 dnl
 dnl Apple:
-dnl  - compile with the option -faltivec
+dnl  - compile with the option -arch ppc -faltivec 
 dnl  - define vectors with parentheses vec = (0,0,0,0)
 dnl GNU
 dnl  - compile with -maltivec -mabi=altivec
@@ -480,7 +481,7 @@
 #include <altivec.h>
 int main() { return(0); }
 EOF
-   if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \
+   if $CC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \
       $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
         AC_MSG_RESULT(yes)
         SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"
@@ -504,9 +505,9 @@
   return(0);
 }
 EOF
-   if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
+   if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
         AC_MSG_RESULT([yes (Apple)])
-        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
 	PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
    else
 cat > conftest.c << EOF
@@ -524,8 +525,9 @@
 EOF
    if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
         AC_MSG_RESULT([yes (GNU)])
-        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
 	PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
+        ALTIVEC_CFLAGS="-maltivec -mabi=altivec"
    else
 	AC_MSG_RESULT([no (ppc support won't be compiled in)])
 	dnl Only C code can be compiled :-(
@@ -696,6 +698,7 @@
 AC_SUBST(STATIC_LIB)
 AC_SUBST(PRE_SHARED_LIB)
 AC_SUBST(SHARED_LIB)
+AC_SUBST(ALTIVEC_CFLAGS)
 
 dnl ==========================================================================
 dnl