--- trunk/xvidcore/build/generic/configure.in	2009/05/28 14:15:53	1866
+++ trunk/xvidcore/build/generic/configure.in	2010/12/31 11:39:06	1938
@@ -8,15 +8,15 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([Xvid], [1.3.0], [xvid-devel@xvid.org])
+AC_INIT([Xvid], [1.4.0], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
 API_MAJOR="4"
-API_MINOR="3"
+API_MINOR="4"
 
 dnl NASM/YASM version requirement
-minimum_yasm_minor_version=8
+minimum_yasm_major_version=1
 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"
@@ -354,15 +355,15 @@
        dnl Checking yasm version
        dnl
        AC_MSG_CHECKING([for yasm version])
-       yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
-       if test -z $yasm_minor ; then
-          yasm_minor=-1
+       yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
+       if test -z $yasm_major ; then
+          yasm_major=-1
        fi
-       AC_MSG_RESULT([$yasm_minor])
+       AC_MSG_RESULT([$yasm_major])
 
        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
+       if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
          AC_MSG_WARN([yasm version is too old])
        else
          found_nasm_comp_prog="yes"
@@ -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 :-(
@@ -589,12 +591,8 @@
 	AC_CHECK_LIB(
 		pthread,
 		pthread_create,
-		AC_CHECK_LIB(
-			pthread,
-			pthread_join,
-			SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-			SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
-			AC_MSG_WARN(Pthread not supported. No SMP support)),
+		SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+		SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
 		AC_MSG_WARN(Pthread not supported. No SMP support)),
 	AC_MSG_WARN(Pthread not supported. No SMP support))
 
@@ -696,6 +694,7 @@
 AC_SUBST(STATIC_LIB)
 AC_SUBST(PRE_SHARED_LIB)
 AC_SUBST(SHARED_LIB)
+AC_SUBST(ALTIVEC_CFLAGS)
 
 dnl ==========================================================================
 dnl