--- branches/dev-api-4/xvidcore/build/generic/configure.in	2003/05/04 23:59:24	1007
+++ branches/dev-api-4/xvidcore/build/generic/configure.in	2003/09/11 14:12:16	1147
@@ -31,9 +31,6 @@
 dnl ==========================================================================
 
 FEATURES=""
-DIVX4COMPAT_SOURCES=""
-DIVX4_ENCORE=""
-DIVX4_DECORE=""
 
 dnl BIGLUT aka old VLC code
 AC_ARG_ENABLE(oldvlc,
@@ -81,14 +78,14 @@
 		  fi],
 		 [assembly="yes"])
 
-dnl Internal Debug
-AC_ARG_ENABLE(divx4compat,
-		AC_HELP_STRING([--enable-divx4compat],
-				 [Enable DivX4 compatibility API]),
-		 [if test "$enable_divx4compat" = "yes" ; then
-		     DIVX4COMPAT_SOURCES="SRC_DIVX4COMPAT"
-		     DIVX4_ENCORE="encore;"
-		     DIVX4_DECORE="decore;"
+dnl Build as a module not a shared lib on darwin
+AC_ARG_ENABLE(macosx_module,
+		AC_HELP_STRING([--enable-macosx_module],
+				 [Build as a module on MacOS X]),
+		 [if test "$enable_macosx_module" = "yes" ; then
+		     macosx_module="yes"
+		  else 
+		     macosx_module="no"
 		  fi])
 
 dnl ==========================================================================
@@ -240,9 +237,14 @@
 	OBJECT_EXTENSION="obj"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([.dynlib .a .o])
+	if test x"$macosx_module" = x"yes"; then
+	   AC_MSG_RESULT([.so .a .o])
+	   SHARED_EXTENSION="so"
+        else
+	   AC_MSG_RESULT([.dynlib .a .o])
+	   SHARED_EXTENSION="dylib"
+	fi
 	STATIC_EXTENSION="a"
-	SHARED_EXTENSION="dylib"
 	OBJECT_EXTENSION="o"
 	;;
      *)
@@ -281,9 +283,16 @@
      darwin*|raphsody*)
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-	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_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)"
+	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"
+	fi
 	;;
      beos)
 	AC_MSG_RESULT([ok])
@@ -404,7 +413,7 @@
 
    case `basename $CC` in
 	*ecc*)
-		DCT_IA64_SOURCES="idct_ia64_ecc.s"
+		DCT_IA64_SOURCES="SRC_IA64_IDCT_ECC"
 
 		dnl If the compiler is ecc, then i don't know its options
 		dnl fallback to "no options"
@@ -413,7 +422,7 @@
 		fi
 		;;
 	*)
-		DCT_IA64_SOURCES="idct_ia64_gcc.s"
+		DCT_IA64_SOURCES="SRC_IA64_IDCT_GCC"
 		;;
    esac
 
@@ -449,7 +458,7 @@
 dnl ==========================================================================
 
 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS $GNU_PROF_LDFLAGS"
-SPECIFIC_CFLAGS="$SPECIFIC_CFLAG $GNU_PROF_CFLAGS"
+SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS $GNU_PROF_CFLAGS"
 
 if test "$enable_gnuprofile" = "yes" ; then
    CFLAGS=`echo $CFLAGS | sed s/'-fomit-frame-pointer'/''/`
@@ -478,10 +487,7 @@
 AC_SUBST(CFLAGS)
 AC_SUBST(SPECIFIC_LDFLAGS)
 AC_SUBST(SPECIFIC_CFLAGS)
-AC_SUBST(DIVX4COMPAT_SOURCES)
 AC_SUBST(DCT_IA64_SOURCES)
-AC_SUBST(DIVX4_ENCORE)
-AC_SUBST(DIVX4_DECORE)
 AC_SUBST(RANLIB)
 AC_SUBST(API_MAJOR)
 AC_SUBST(API_MINOR)
@@ -495,6 +501,5 @@
 dnl ==========================================================================
 
 AC_CONFIG_FILES(platform.inc)
-AC_CONFIG_FILES(libxvidcore.def)
 
 AC_OUTPUT