--- branches/dev-api-4/xvidcore/build/generic/configure.in	2003/07/16 23:01:45	1090
+++ 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,
@@ -91,16 +88,6 @@
 		     macosx_module="no"
 		  fi])
 
-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;"
-		  fi])
-
 dnl ==========================================================================
 dnl Default install prefix and checks build type
 dnl ==========================================================================
@@ -304,7 +291,7 @@
 	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"
+	   SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
 	fi
 	;;
      beos)
@@ -500,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)
@@ -517,6 +501,5 @@
 dnl ==========================================================================
 
 AC_CONFIG_FILES(platform.inc)
-AC_CONFIG_FILES(libxvidcore.def)
 
 AC_OUTPUT