--- trunk/xvidcore/build/generic/configure.in	2005/05/17 15:55:24	1615
+++ trunk/xvidcore/build/generic/configure.in	2007/11/23 10:44:11	1788
@@ -17,6 +17,8 @@
 
 dnl NASM version requirement
 minimum_nasm_patch_version=34
+minimum_nasm_minor_version=99
+minimum_nasm_major_version=2
 nasm_prog="nasm"
 yasm_prog="yasm"
 
@@ -265,7 +267,14 @@
 SPECIFIC_CFLAGS=""
 PRE_SHARED_LIB=""
 case "$target_os" in
-     *bsd*|linux*|irix*|solaris*)
+     linux*|solaris*)
+	AC_MSG_RESULT([ok])
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
+	SPECIFIC_CFLAGS="-fPIC"
+	;;
+     *bsd*|irix*)
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
@@ -357,14 +366,31 @@
            dnl
            AC_MSG_CHECKING([for nasm patch version])
            nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
+           nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
+           nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
            if test -z $nasm_patch ; then
               nasm_patch=-1
            fi
+           if test -z $nasm_minor ; then
+              nasm_minor=-1
+           fi
+           if test -z $nasm_major ; then
+              nasm_major=-1
+           fi
            AC_MSG_RESULT([$nasm_patch])
 
-
            if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
-               AC_MSG_WARN([nasm patch version is too old])
+              if test "$nasm_minor" -lt "$minimum_nasm_minor_version" ; then
+                 if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
+                    AC_MSG_WARN([nasm version is too old])
+                 else
+                   found_nasm_comp_prog="yes"
+		           chosen_asm_prog="$nasm_prog"
+                 fi
+              else
+                 found_nasm_comp_prog="yes"
+                     chosen_asm_prog="$nasm_prog"
+              fi
            else
                found_nasm_comp_prog="yes"
 		       chosen_asm_prog="$nasm_prog"
@@ -390,6 +416,12 @@
 	       PREFIX="-DPREFIX"
 	       MARK_FUNCS=""
                ;;
+           *darwin*)
+               AC_MSG_RESULT([macho])
+               NASM_FORMAT="macho"
+               PREFIX="-DPREFIX"
+               MARK_FUNCS=""
+               ;;
        esac
 
        AS="$chosen_asm_prog"
@@ -538,6 +570,26 @@
 
 dnl ==========================================================================
 dnl
+dnl Check for pthread
+dnl
+dnl ==========================================================================
+
+AC_CHECK_HEADER(
+	pthread.h,
+	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)),
+		AC_MSG_WARN(Pthread not supported. No SMP support)),
+	AC_MSG_WARN(Pthread not supported. No SMP support))
+
+dnl ==========================================================================
+dnl 
 dnl Now we can set CFLAGS if needed
 dnl
 dnl ==========================================================================
@@ -588,7 +640,7 @@
 	rm -f gcc-ver
 
 	# GCC 4.x
-	if test $GCC_MAJOR -gt 3 ; then
+	if test "${GCC_MAJOR}" -gt 3 ; then
 		CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
 		CFLAGS=`echo $CFLAGS | sed s,'-freduce-all-givs','',g`
 		CFLAGS=`echo $CFLAGS | sed s,'-fmove-all-movables','',g`
@@ -597,7 +649,7 @@
 	fi
 
 	# GCC 3.4.x
-	if test $GCC_MAJOR -eq 3 && $GCC_MINOR -gt 3 ; then
+	if test "${GCC_MAJOR}" -eq 3 && test "${GCC_MINOR}" -gt 3 ; then
 		CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
 	fi
 fi