--- branches/release-0_9_1-fixes/xvidcore/build/generic/configure.in	2003/05/14 20:23:02	1023
+++ branches/release-0_9_1-fixes/xvidcore/build/generic/configure.in	2003/05/14 23:32:54	1024
@@ -72,6 +72,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],
@@ -232,9 +242,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"
 	;;
      *)
@@ -253,7 +268,7 @@
 	AC_MSG_RESULT([-Wl,-soname,libxvidcore.so -shared -lc -lm])
 	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)
@@ -264,11 +279,17 @@
 	SPECIFIC_CFLAGS="-mno-cygwin"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([-dynamiclib -flat_namespace])
 	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([-dynamiclib -flat_namespace])
+	   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(["-r -keep_private_externs -nostdlib -bundle -flat_namespace -undefined suppress])
+	   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)
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"