--- branches/dev-api-4/xvidcore/build/generic/configure.in	2003/09/11 14:12:16	1147
+++ branches/dev-api-4/xvidcore/build/generic/configure.in	2003/09/28 13:21:59	1154
@@ -19,12 +19,13 @@
 
 dnl Default CFLAGS -- Big impact on overall speed
 our_cflags_defaults="-Wall"
-our_cflags_defaults="$our_cflags_defaults -O2"
-our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"
+our_cflags_defaults="$our_cflags_defaults -O1"
+our_cflags_defaults="$our_cflags_defaults -fstrength-reduce"
+our_cflags_defaults="$our_cflags_defaults -finline-functions"
+our_cflags_defaults="$our_cflags_defaults -fgcse"
+our_cflags_defaults="$our_cflags_defaults -freduce-all-givs"
 our_cflags_defaults="$our_cflags_defaults -ffast-math"
-our_cflags_defaults="$our_cflags_defaults -funroll-loops"
-our_cflags_defaults="$our_cflags_defaults -fschedule-insns"
-our_cflags_defaults="$our_cflags_defaults -fschedule-insns2"
+our_cfalgs_defaults="$our_cflags_defaults -fomit-frame-pointer"
 
 dnl ==========================================================================
 dnl Features - configure options
@@ -86,7 +87,8 @@
 		     macosx_module="yes"
 		  else 
 		     macosx_module="no"
-		  fi])
+		  fi],
+		  [macosx_module="no"])
 
 dnl ==========================================================================
 dnl Default install prefix and checks build type
@@ -265,6 +267,7 @@
 AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)
 SPECIFIC_LDFLAGS=""
 SPECIFIC_CFLAGS=""
+PRE_SHARED_LIB=""
 case "$target_os" in
      *bsd*|linux*|irix*|solaris*)
 	AC_MSG_RESULT([ok])
@@ -281,17 +284,17 @@
 	SPECIFIC_CFLAGS="-mno-cygwin"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
 	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_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
+	   SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
 	else 
-	   AC_MSG_RESULT(["module options])
-	   SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
-	   SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
+	   AC_MSG_RESULT([module options])
+ 	   PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
+	   SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+	   SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
 	fi
 	;;
      beos)
@@ -310,6 +313,10 @@
 	;;
 esac
 
+if test x"$PRE_SHARED_LIB" = x; then 
+  PRE_SHARED_LIB=$SHARED_LIB
+fi
+
 dnl ==========================================================================
 dnl
 dnl Assembler stuff
@@ -340,8 +347,12 @@
       dnl
       AC_MSG_CHECKING([for nasm patch version])
       nasm_patch=`nasm -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
+      if test -z $nasm_patch ; then
+        nasm_patch=-1
+      fi
       AC_MSG_RESULT([$nasm_patch])
 
+
       if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
         AC_MSG_WARN([nasm patch version too old - Compiling generic sources only])
 	ARCHITECTURE="GENERIC"
@@ -492,6 +503,7 @@
 AC_SUBST(API_MAJOR)
 AC_SUBST(API_MINOR)
 AC_SUBST(STATIC_LIB)
+AC_SUBST(PRE_SHARED_LIB)
 AC_SUBST(SHARED_LIB)
 
 dnl ==========================================================================