--- branches/release-1_3-branch/xvidcore/build/generic/configure.in 2011/02/25 13:15:35 1958 +++ branches/release-1_3-branch/xvidcore/build/generic/configure.in 2012/10/04 14:26:11 2064 @@ -8,7 +8,7 @@ AC_PREREQ([2.50]) -AC_INIT([Xvid], [1.3.0], [xvid-devel@xvid.org]) +AC_INIT([Xvid], [1.3.2], [xvid-devel@xvid.org]) AC_CONFIG_SRCDIR(configure.in) dnl Do not forget to increase that when needed. @@ -74,6 +74,19 @@ fi], [assembly="yes"]) +dnl pthread code +AC_ARG_ENABLE(pthread, + AC_HELP_STRING([--disable-pthread], + [Disable pthread dependent code]), + [if test "$enable_pthread" = "no" ; then + pthread="no" + else + if test "$enable_pthread" = "yes" ; then + pthread="yes" + fi + fi], + [pthread="yes"]) + dnl Build as a module not a shared lib on darwin AC_ARG_ENABLE(macosx_module, AC_HELP_STRING([--enable-macosx_module], @@ -131,6 +144,18 @@ AC_CHECK_TOOL([AR], [ar], [ar-not-found]) dnl ========================================================================== +dnl Check for the egrep program +dnl ========================================================================== + +AC_PROG_EGREP + +dnl ========================================================================== +dnl Check how the system supports symlinks. +dnl ========================================================================== + +AC_PROG_LN_S + +dnl ========================================================================== dnl dnl This part looks for: dnl @@ -224,7 +249,7 @@ STATIC_EXTENSION="" OBJECT_EXTENSION="" case "$target_os" in - *bsd*|linux*|beos|irix*|solaris*) + *bsd*|linux*|beos|irix*|solaris*|gnu*) AC_MSG_RESULT([.so .a .o]) STATIC_EXTENSION="a" SHARED_EXTENSION="so" @@ -236,7 +261,7 @@ SHARED_EXTENSION="dll" OBJECT_EXTENSION="obj" ;; - darwin*|raphsody*) + darwin*) if test x"$macosx_module" = x"yes"; then AC_MSG_RESULT([.so .a .o]) SHARED_EXTENSION="so" @@ -267,11 +292,15 @@ SPECIFIC_CFLAGS="" ALTIVEC_CFLAGS="" PRE_SHARED_LIB="" +SO_API_MAJOR_LINK="" +SO_LINK="" case "$target_os" in - linux*|solaris*) + linux*|solaris*|gnu*) AC_MSG_RESULT([ok]) STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" + SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" + SO_LINK="libxvidcore.\$(SHARED_EXTENSION)" SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm" SPECIFIC_CFLAGS="-fPIC" ;; @@ -279,6 +308,8 @@ AC_MSG_RESULT([ok]) STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" + SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" + SO_LINK="libxvidcore.\$(SHARED_EXTENSION)" SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm" SPECIFIC_CFLAGS="-fPIC" ;; @@ -286,10 +317,10 @@ 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_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" SPECIFIC_CFLAGS="-mno-cygwin" ;; - darwin*|raphsody*) + darwin*) STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp" if test x"$macosx_module" = x"no"; then @@ -406,7 +437,7 @@ if test "$found_nasm_comp_prog" = "yes" ; then AC_MSG_CHECKING([for asm object format]) case "$target_os" in - *bsd*|linux*|beos|irix*|solaris*) + *bsd*|linux*|beos|irix*|solaris*|gnu*) if test "$ARCHITECTURE" = "X86_64" ; then AC_MSG_RESULT([elf64]) NASM_FORMAT="elf64" @@ -425,8 +456,16 @@ AC_MSG_RESULT([win32]) NASM_FORMAT="win32" fi - PREFIX="-DWINDOWS" - MARK_FUNCS="" + PREFIX="-DWINDOWS" + if test "$GCC" = "yes" ; then + echo 'int main(void) {return 0;}' > conftest.c + $CC -S -o conftest conftest.c + if test `$EGREP -c '_main:' conftest` -eq 0 ; then + PREFIX="$PREFIX -DNO_PREFIX" + fi + rm -f conftest* + fi + MARK_FUNCS="" ;; *darwin*) if test "$ARCHITECTURE" = "X86_64" ; then @@ -592,15 +631,39 @@ dnl dnl ========================================================================== -AC_CHECK_HEADER( - [pthread.h], - [AC_CHECK_LIB( - [pthread], - [pthread_create], - [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" - SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"], - AC_MSG_WARN(Pthread not supported. No SMP support))], - AC_MSG_WARN(Pthread not supported. No SMP support)) +if test x"$pthread" = x"yes" ; then + case "$target_os" in + mingw32*) + AC_CHECK_HEADER( + [pthread.h], + [AC_CHECK_LIB( + [pthreadGC2], + [pthread_create], + [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" + SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthreadGC2"], + [AC_CHECK_LIB( + [pthread], + [pthread_create], + [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" + SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"], + AC_MSG_WARN(Pthread not supported. No SMP support))])], + AC_MSG_WARN(Pthread not supported. No SMP support)) + ;; + *) + AC_CHECK_HEADER( + [pthread.h], + [AC_CHECK_LIB( + [pthread], + [pthread_create], + [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" + SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"], + AC_MSG_WARN(Pthread not supported. No SMP support))], + AC_MSG_WARN(Pthread not supported. No SMP support)) + ;; + esac +else + AC_MSG_WARN(Pthread support disabled. No SMP support) +fi dnl ========================================================================== dnl @@ -632,26 +695,9 @@ dnl ========================================================================== if test "$GCC" = "yes" ; then -cat << EOF > test.c -#include -int main(int argc, char **argv) -{ - if (*argv[[1]] == 'M') { - printf("%d", __GNUC__); - } - if (*argv[[1]] == 'm') { - printf("%d", __GNUC_MINOR__); - } - return 0; -} -EOF - $CC -o gcc-ver test.c - - GCC_MAJOR=`./gcc-ver M` - GCC_MINOR=`./gcc-ver m` - rm -f test.c - rm -f gcc-ver + GCC_MAJOR=`$CC -dumpversion | cut -d . -f 1` + GCC_MINOR=`$CC -dumpversion | cut -d . -f 2` # GCC 4.x if test "${GCC_MAJOR}" -gt 3 ; then @@ -660,6 +706,7 @@ CFLAGS=`echo $CFLAGS | sed s,'-fmove-all-movables','',g` CFLAGS=`echo $CFLAGS | sed s,'-fnew-ra','',g` CFLAGS=`echo $CFLAGS | sed s,'-fwritable-strings','',g` + SPECIFIC_CFLAGS=`echo $SPECIFIC_CFLAGS | sed s,'-mno-cygwin','',g` fi # GCC 3.4.x @@ -690,16 +737,20 @@ AC_SUBST(ASSEMBLY_SOURCES) AC_SUBST(CC) AC_SUBST(CFLAGS) +AC_SUBST(LDFLAGS) AC_SUBST(SPECIFIC_LDFLAGS) AC_SUBST(SPECIFIC_CFLAGS) AC_SUBST(DCT_IA64_SOURCES) AC_SUBST(PPC_ALTIVEC_SOURCES) +AC_SUBST(LN_S) AC_SUBST(RANLIB) AC_SUBST(AR) AC_SUBST(API_MAJOR) AC_SUBST(API_MINOR) AC_SUBST(STATIC_LIB) AC_SUBST(PRE_SHARED_LIB) +AC_SUBST(SO_API_MAJOR_LINK) +AC_SUBST(SO_LINK) AC_SUBST(SHARED_LIB) AC_SUBST(ALTIVEC_CFLAGS)