--- branches/dev-api-4/xvidcore/build/generic/configure.in	2003/04/09 21:30:31	981
+++ branches/dev-api-4/xvidcore/build/generic/configure.in	2003/07/16 23:01:45	1090
@@ -10,7 +10,7 @@
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
-API_MAJOR="3"
+API_MAJOR="4"
 API_MINOR="0"
 
 dnl NASM version requirement
@@ -81,6 +81,16 @@
 		  fi],
 		 [assembly="yes"])
 
+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 Internal Debug
 AC_ARG_ENABLE(divx4compat,
 		AC_HELP_STRING([--enable-divx4compat],
@@ -240,9 +250,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"
 	;;
      *)
@@ -268,7 +283,7 @@
 	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) -shared -lc -lm"
+	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
      [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
@@ -281,9 +296,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) -bundle -flat_namespace -undefined suppress"
+	fi
 	;;
      beos)
 	AC_MSG_RESULT([ok])
@@ -404,7 +426,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 +435,7 @@
 		fi
 		;;
 	*)
-		DCT_IA64_SOURCES="idct_ia64_gcc.s"
+		DCT_IA64_SOURCES="SRC_IA64_IDCT_GCC"
 		;;
    esac
 
@@ -449,7 +471,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'/''/`