--- branches/dev-api-4/xvidcore/build/generic/configure.in	2003/09/11 17:11:49	1152
+++ branches/dev-api-4/xvidcore/build/generic/configure.in	2004/01/02 23:24:49	1303
@@ -6,7 +6,7 @@
 dnl
 dnl ==========================================================================
 
-AC_INIT([XviD], [1.0.0 cvs-snapshot], [xvid-devel@xvid.org])
+AC_INIT([XviD], [1.0.0 beta3], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
@@ -20,11 +20,11 @@
 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 -fstrength-reduce"
+our_cflags_defaults="$our_cflags_defaults -finline-functions"
+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
@@ -32,14 +32,6 @@
 
 FEATURES=""
 
-dnl BIGLUT aka old VLC code
-AC_ARG_ENABLE(oldvlc,
-		AC_HELP_STRING([--enable-oldvlc],
-				 [Enable old VLC code (Needs much more memory ~10MB)]),
-		[if test "$enable_oldvlc" = "yes" ; then
-		    FEATURES="$FEATURES -DBIGLUT"
-		 fi])
-
 dnl Internal Debug
 AC_ARG_ENABLE(idebug,
 		AC_HELP_STRING([--enable-idebug],
@@ -86,7 +78,8 @@
 		     macosx_module="yes"
 		  else 
 		     macosx_module="no"
-		  fi])
+		  fi],
+		  [macosx_module="no"])
 
 dnl ==========================================================================
 dnl Default install prefix and checks build type
@@ -230,7 +223,7 @@
 	SHARED_EXTENSION="so"
 	OBJECT_EXTENSION="o"
 	;;
-     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
+     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
 	AC_MSG_RESULT([.dll .a .obj])
 	STATIC_EXTENSION="a"
 	SHARED_EXTENSION="dll"
@@ -274,21 +267,20 @@
 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
-     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
+     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
 	AC_MSG_RESULT([ok])
-	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
 	SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
 	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])
  	   PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
@@ -346,8 +338,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"
@@ -363,7 +359,7 @@
                   NASM_FORMAT="elf"
 		  PREFIX=""
                   ;;
-              [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
+              [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
                   AC_MSG_RESULT([win32])
                   NASM_FORMAT="win32"
 		  PREFIX="-DPREFIX"
@@ -371,7 +367,7 @@
           esac
 
           AS=nasm
-          AFLAGS="-I\$(<D) -f $NASM_FORMAT $PREFIX"
+          AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX"
           ASSEMBLY_EXTENSION="asm"
           ASSEMBLY_SOURCES="SRC_IA32"
        fi