--- trunk/xvidcore/build/generic/configure.in	2003/02/13 17:31:33	845
+++ trunk/xvidcore/build/generic/configure.in	2003/05/14 23:32:54	1024
@@ -6,9 +6,13 @@
 dnl
 dnl ==========================================================================
 
-AC_INIT([XviD], [0.9.1], [xvid-devel@xvid.org])
+AC_INIT([XviD], [1.0.0 cvs-snapshot], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
+dnl Do not forget to increase that when needed.
+API_MAJOR="3"
+API_MINOR="0"
+
 dnl NASM version requirement
 minimum_nasm_patch_version=34
 nasm_prog="nasm"
@@ -68,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],
@@ -222,15 +236,20 @@
 	OBJECT_EXTENSION="o"
 	;;
      [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
-	AC_MSG_RESULT([.dll .lib .obj])
-	STATIC_EXTENSION="lib"
+	AC_MSG_RESULT([.dll .a .obj])
+	STATIC_EXTENSION="a"
 	SHARED_EXTENSION="dll"
 	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"
 	;;
      *)
@@ -246,27 +265,43 @@
 SPECIFIC_CFLAGS=""
 case "$target_os" in
      *bsd*|linux*|irix*|solaris*)
-	AC_MSG_RESULT([-shared -lc -lm])
-	SPECIFIC_LDFLAGS="-shared -lc -lm"
+	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).\$(API_MAJOR) -shared -lc -lm"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
      [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
 	AC_MSG_RESULT([-shared -Wl,--dll,--out-implib,\$@.a])
-	SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+	SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
 	SPECIFIC_CFLAGS="-mno-cygwin"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([-dynamiclib -flat_namespace])
-	SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace"
-	SPECIFIC_CFLAGS="-fPIC -fno-common"
+	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)"
+	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)
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
 	AC_MSG_RESULT([-nostart])
 	SPECIFIC_LDFLAGS="-nostart"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
      *)
         AC_MSG_RESULT([Unknown OS - -shared -lc -lm])
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
 	SPECIFIC_LDFLAGS=""
 	SPECIFIC_CFLAGS=""
 	;;
@@ -438,6 +473,10 @@
 AC_SUBST(DIVX4_ENCORE)
 AC_SUBST(DIVX4_DECORE)
 AC_SUBST(RANLIB)
+AC_SUBST(API_MAJOR)
+AC_SUBST(API_MINOR)
+AC_SUBST(STATIC_LIB)
+AC_SUBST(SHARED_LIB)
 
 dnl ==========================================================================
 dnl