--- trunk/xvidcore/build/generic/configure.in 2003/05/14 23:32:54 1024 +++ trunk/xvidcore/build/generic/configure.in 2004/06/12 13:02:12 1472 @@ -2,15 +2,17 @@ dnl dnl Autoconf script for XviD dnl -dnl Copyright(C) 2003 Edouard Gomez +dnl Copyright(C) 2003-2004 Edouard Gomez dnl dnl ========================================================================== -AC_INIT([XviD], [1.0.0 cvs-snapshot], [xvid-devel@xvid.org]) +AC_PREREQ([2.50]) + +AC_INIT([XviD], [1.0.1], [xvid-devel@xvid.org]) 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 @@ -20,28 +22,17 @@ dnl Default CFLAGS -- Big impact on overall speed our_cflags_defaults="-Wall" our_cflags_defaults="$our_cflags_defaults -O2" -our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer" +our_cflags_defaults="$our_cflags_defaults -fstrength-reduce" +our_cflags_defaults="$our_cflags_defaults -finline-functions" +our_cflags_defaults="$our_cflags_defaults -freduce-all-givs" our_cflags_defaults="$our_cflags_defaults -ffast-math" -our_cflags_defaults="$our_cflags_defaults -funroll-loops" -our_cflags_defaults="$our_cflags_defaults -fschedule-insns" -our_cflags_defaults="$our_cflags_defaults -fschedule-insns2" +our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer" dnl ========================================================================== dnl Features - configure options dnl ========================================================================== FEATURES="" -DIVX4COMPAT_SOURCES="" -DIVX4_ENCORE="" -DIVX4_DECORE="" - -dnl BIGLUT aka old VLC code -AC_ARG_ENABLE(oldvlc, - AC_HELP_STRING([--enable-oldvlc], - [Enable old VLC code (Needs much more memory ~10MB)]), - [if test "$enable_oldvlc" = "yes" ; then - FEATURES="$FEATURES -DBIGLUT" - fi]) dnl Internal Debug AC_ARG_ENABLE(idebug, @@ -59,6 +50,15 @@ FEATURES="$FEATURES -D_PROFILING_" fi]) +dnl GNU Profiling options +AC_ARG_ENABLE(gnuprofile, + AC_HELP_STRING([--enable-gnuprofile], + [Enable profiling informations for gprof]), + [if test "$enable_gnuprofile" = "yes" ; then + GNU_PROF_CFLAGS="-pg -fprofile-arcs -ftest-coverage" + GNU_PROF_LDFLAGS="-pg" + fi]) + dnl Assembly code AC_ARG_ENABLE(assembly, AC_HELP_STRING([--disable-assembly], @@ -80,18 +80,8 @@ macosx_module="yes" else 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]) - + fi], + [macosx_module="no"]) dnl ========================================================================== dnl Default install prefix and checks build type @@ -174,9 +164,7 @@ ;; powerpc) AC_MSG_RESULT(PowerPC) - dnl ATM the ppc port is out of date - dnl ARCHITECTURE="PPC" - ARCHITECTURE="GENERIC" + ARCHITECTURE="PPC" ;; ia64) AC_MSG_RESULT(ia64) @@ -235,7 +223,7 @@ SHARED_EXTENSION="so" OBJECT_EXTENSION="o" ;; - [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks) + [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*) AC_MSG_RESULT([.dll .a .obj]) STATIC_EXTENSION="a" SHARED_EXTENSION="dll" @@ -260,21 +248,29 @@ ;; esac +dnl ========================================================================== +dnl +dnl Determines best options for CC and LD +dnl - STATIC_LIB, SHARED_LIB, SPECIFIC_CFLAGS, SPECIFIC_LDLAGS +dnl +dnl ========================================================================== + AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS) SPECIFIC_LDFLAGS="" SPECIFIC_CFLAGS="" +PRE_SHARED_LIB="" case "$target_os" in *bsd*|linux*|irix*|solaris*) - AC_MSG_RESULT([-Wl,-soname,libxvidcore.so -shared -lc -lm]) + 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).\$(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]) - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" - SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" + [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*) + AC_MSG_RESULT([ok]) + STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" + SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" SPECIFIC_CFLAGS="-mno-cygwin" ;; @@ -284,22 +280,23 @@ 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)" + SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(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" + AC_MSG_RESULT([module options]) + PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o" + SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" + SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress" fi ;; beos) + AC_MSG_RESULT([ok]) 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]) + AC_MSG_RESULT([Unknown Platform (Using default -shared -lc -lm)]) STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" SPECIFIC_LDFLAGS="" @@ -307,9 +304,14 @@ ;; esac +if test x"$PRE_SHARED_LIB" = x; then + PRE_SHARED_LIB=$SHARED_LIB +fi + dnl ========================================================================== dnl -dnl Assembler stuff - AS, AFLAGS, ASSEMBLY_EXTENSION, SOURCES +dnl Assembler stuff +dnl - AS, AFLAGS, ASSEMBLY_EXTENSION, SOURCES dnl dnl ========================================================================== @@ -336,8 +338,12 @@ dnl AC_MSG_CHECKING([for nasm patch version]) nasm_patch=`nasm -r | cut -d '.' -f 3 | cut -d ' ' -f 1` + if test -z $nasm_patch ; then + nasm_patch=-1 + fi AC_MSG_RESULT([$nasm_patch]) + if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then AC_MSG_WARN([nasm patch version too old - Compiling generic sources only]) ARCHITECTURE="GENERIC" @@ -353,7 +359,7 @@ NASM_FORMAT="elf" PREFIX="" ;; - [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks) + [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*) AC_MSG_RESULT([win32]) NASM_FORMAT="win32" PREFIX="-DPREFIX" @@ -361,7 +367,7 @@ esac AS=nasm - AFLAGS="-I\$( before using intrincic +dnl - define vectors with vec = {0,0,0,0} +dnl +dnl * The compile time option will be "injected" into SPECIFIC_CFLAGS variable +dnl * The need for altivec.h will also be injected into SPECIFIC_CFLAGS through +dnl a -DHAVE_ALTIVEC_H +dnl * The vector definition is handled in portab.h thx to +dnl HAVE_PARENTHESES/BRACES_ALTIVEC_DECL +dnl +PPC_ALTIVEC_SOURCES="" if test "$ARCHITECTURE" = "PPC" ; then AS="\$(CC)" - AFLAGS="-c" - ASSEMBLY_EXTENSION="s" - ASSEMBLY_SOURCES="SRC_PPC" - AC_MSG_CHECKING([for Altivec support]) - cat > conftest.S << EOF - .text - vxor 0,0,0 + AFLAGS="" + ASSEMBLY_EXTENSION=".s" + ASSEMBLY_SOURCES="" + + AC_MSG_CHECKING([for altivec.h]) +cat > conftest.c << EOF +#include +int main() { return(0); } EOF - if $CC -c conftest.S 2>/dev/null 1>/dev/null ; then + if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \ + $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then AC_MSG_RESULT(yes) - SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DARCH_IS_PPC_ALTIVEC" - ASSEMBLY_SOURCES="SRC_ALTIVEC" + SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H" + TEMP_ALTIVEC="-DHAVE_ALTIVEC_H" else AC_MSG_RESULT(no) + TEMP_ALTIVEC="" + fi + + AC_MSG_CHECKING([for Altivec compiler support]) +cat > conftest.c << EOF +#ifdef HAVE_ALTIVEC_H +#include +#endif + +int main() +{ + vector unsigned int vartest2 = (vector unsigned int)(0); + vector unsigned int vartest3 = (vector unsigned int)(1); + vartest2 = vec_add(vartest2, vartest3); + return(0); +} +EOF + if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then + AC_MSG_RESULT([yes (Apple)]) + SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC" + PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC" + else +cat > conftest.c << EOF +#ifdef HAVE_ALTIVEC_H +#include +#endif + +int main() +{ + vector unsigned int vartest2 = (vector unsigned int){0}; + vector unsigned int vartest3 = (vector unsigned int){1}; + vartest2 = vec_add(vartest2, vartest3); + return(0); +} +EOF + if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then + AC_MSG_RESULT([yes (GNU)]) + SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC" + PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC" + else + AC_MSG_RESULT([no (ppc support won't be compiled in)]) + dnl Only C code can be compiled :-( + ARCHITECTURE="GENERIC" fi + fi + rm -f conftest.* fi @@ -409,7 +480,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" @@ -418,7 +489,7 @@ fi ;; *) - DCT_IA64_SOURCES="idct_ia64_gcc.s" + DCT_IA64_SOURCES="SRC_IA64_IDCT_GCC" ;; esac @@ -433,6 +504,10 @@ AC_CHECK_HEADERS( stdio.h \ signal.h \ + stdlib.h \ + string.h \ + assert.h \ + math.h \ , , AC_MSG_ERROR(Missing header file)) dnl ========================================================================== @@ -447,6 +522,21 @@ dnl ========================================================================== dnl +dnl Profiling stuff goes here +dnl - adds options to SPECIFIC_CFLAGS, SPECIFIC_LDLAGS +dnl - removes incompatible options from CFLAGS +dnl +dnl ========================================================================== + +SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS $GNU_PROF_LDFLAGS" +SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS $GNU_PROF_CFLAGS" + +if test "$enable_gnuprofile" = "yes" ; then + CFLAGS=`echo $CFLAGS | sed s/'-fomit-frame-pointer'/''/` +fi + +dnl ========================================================================== +dnl dnl Substitions dnl dnl ========================================================================== @@ -468,14 +558,13 @@ 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(PPC_ALTIVEC_SOURCES) AC_SUBST(RANLIB) AC_SUBST(API_MAJOR) AC_SUBST(API_MINOR) AC_SUBST(STATIC_LIB) +AC_SUBST(PRE_SHARED_LIB) AC_SUBST(SHARED_LIB) dnl ========================================================================== @@ -485,6 +574,5 @@ dnl ========================================================================== AC_CONFIG_FILES(platform.inc) -AC_CONFIG_FILES(libxvidcore.def) AC_OUTPUT