[svn] / trunk / xvidcore / build / generic / configure.in Repository:
ViewVC logotype

Diff of /trunk/xvidcore/build/generic/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1794, Fri Nov 14 15:43:28 2008 UTC revision 1870, Thu May 28 16:59:21 2009 UTC
# Line 1  Line 1 
1  dnl ==========================================================================  dnl ==========================================================================
2  dnl  dnl
3  dnl Autoconf script for XviD  dnl Autoconf script for Xvid
4  dnl  dnl
5  dnl Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>  dnl Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>
6  dnl  dnl
# Line 8  Line 8 
8    
9  AC_PREREQ([2.50])  AC_PREREQ([2.50])
10    
11  AC_INIT([XviD], [1.1.0-beta2], [xvid-devel@xvid.org])  AC_INIT([Xvid], [1.3.0], [xvid-devel@xvid.org])
12  AC_CONFIG_SRCDIR(configure.in)  AC_CONFIG_SRCDIR(configure.in)
13    
14  dnl Do not forget to increase that when needed.  dnl Do not forget to increase that when needed.
15  API_MAJOR="4"  API_MAJOR="4"
16  API_MINOR="1"  API_MINOR="3"
17    
18  dnl NASM version requirement  dnl NASM/YASM version requirement
19  minimum_nasm_patch_version=34  minimum_yasm_minor_version=8
20  minimum_nasm_minor_version=99  minimum_nasm_minor_version=0
21  minimum_nasm_major_version=2  minimum_nasm_major_version=2
22  nasm_prog="nasm"  nasm_prog="nasm"
23  yasm_prog="yasm"  yasm_prog="yasm"
# Line 27  Line 27 
27  our_cflags_defaults="$our_cflags_defaults -O2"  our_cflags_defaults="$our_cflags_defaults -O2"
28  our_cflags_defaults="$our_cflags_defaults -fstrength-reduce"  our_cflags_defaults="$our_cflags_defaults -fstrength-reduce"
29  our_cflags_defaults="$our_cflags_defaults -finline-functions"  our_cflags_defaults="$our_cflags_defaults -finline-functions"
 our_cflags_defaults="$our_cflags_defaults -freduce-all-givs"  
30  our_cflags_defaults="$our_cflags_defaults -ffast-math"  our_cflags_defaults="$our_cflags_defaults -ffast-math"
31  our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"  our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"
32    
# Line 201  Line 200 
200          BUS="64BIT"          BUS="64BIT"
201          ;;          ;;
202       *)       *)
203          AC_MSG_ERROR([XviD supports only 32/64 bit architectures])          AC_MSG_ERROR([Xvid supports only 32/64 bit architectures])
204          ;;          ;;
205  esac  esac
206    
# Line 294  Line 293 
293          if test x"$macosx_module" = x"no"; then          if test x"$macosx_module" = x"no"; then
294             AC_MSG_RESULT([dylib options])             AC_MSG_RESULT([dylib options])
295             SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"             SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
296             SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"             SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
297          else          else
298             AC_MSG_RESULT([module options])             AC_MSG_RESULT([module options])
299             PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"             PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
# Line 343  Line 342 
342    
343     dnl     dnl
344     dnl Checking for nasm compatible programs     dnl Checking for nasm compatible programs
    dnl yasm is preferred over nasm, because... i can use it  
    dnl to profile assembly code ;-)  
345     dnl     dnl
346    
347     found_nasm_comp_prog="no"     found_nasm_comp_prog="no"
# Line 353  Line 350 
350     dnl Check for yasm first     dnl Check for yasm first
351     AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes])     AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes])
352     if test "$ac_yasm" = "yes" ; then     if test "$ac_yasm" = "yes" ; then
353           dnl
354           dnl Checking yasm version
355           dnl
356           AC_MSG_CHECKING([for yasm version])
357           yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
358           if test -z $yasm_minor ; then
359              yasm_minor=-1
360           fi
361           AC_MSG_RESULT([$yasm_minor])
362    
363           dnl Actually, yasm >= 0.7.99.2161 should be ok
364           dnl But I'm too lazy to check also the patch version...
365           if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
366             AC_MSG_WARN([yasm version is too old])
367           else
368       found_nasm_comp_prog="yes"       found_nasm_comp_prog="yes"
369       chosen_asm_prog="$yasm_prog"       chosen_asm_prog="$yasm_prog"
370     fi     fi
371       fi
372    
373     dnl if yasm hasn't been found, then check for nasm (not buggy version)     dnl Check for nasm (not buggy version)
374     if test "$found_nasm_comp_prog" = "no" ; then     if test "$found_nasm_comp_prog" = "no" ; then
375         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
376         if test "$ac_nasm" = "yes" ; then         if test "$ac_nasm" = "yes" ; then
377             dnl             dnl
378             dnl Checking nasm patch version             dnl Checking nasm version
379             dnl             dnl
380             AC_MSG_CHECKING([for nasm patch version])             AC_MSG_CHECKING([for nasm version])
            nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`  
381             nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`             nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
382             nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`             nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
            if test -z $nasm_patch ; then  
               nasm_patch=-1  
            fi  
383             if test -z $nasm_minor ; then             if test -z $nasm_minor ; then
384                nasm_minor=-1                nasm_minor=-1
385             fi             fi
386             if test -z $nasm_major ; then             if test -z $nasm_major ; then
387                nasm_major=-1                nasm_major=-1
388             fi             fi
389             AC_MSG_RESULT([$nasm_patch])             AC_MSG_RESULT([$nasm_major])
390    
391             dnl need nasm 2.x for SSE3/4 and X86_64             dnl need nasm 2.x for SSE3/4 and X86_64
392             if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then             if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
# Line 396  Line 405 
405         AC_MSG_CHECKING([for asm object format])         AC_MSG_CHECKING([for asm object format])
406         case "$target_os" in         case "$target_os" in
407             *bsd*|linux*|beos|irix*|solaris*)             *bsd*|linux*|beos|irix*|solaris*)
408                   if test "$ARCHITECTURE" = "X86_64" ; then
409                       AC_MSG_RESULT([elf64])
410                       NASM_FORMAT="elf64"
411                   else
412                 AC_MSG_RESULT([elf])                 AC_MSG_RESULT([elf])
413                 NASM_FORMAT="elf"                 NASM_FORMAT="elf"
414                   fi
415                 MARK_FUNCS="-DMARK_FUNCS"                 MARK_FUNCS="-DMARK_FUNCS"
416                     PREFIX=""                     PREFIX=""
417                 ;;                 ;;
418             [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)             [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
419                   if test "$ARCHITECTURE" = "X86_64" ; then
420                       AC_MSG_RESULT([win64])
421                       NASM_FORMAT="win64"
422                   else
423                 AC_MSG_RESULT([win32])                 AC_MSG_RESULT([win32])
424                 NASM_FORMAT="win32"                 NASM_FORMAT="win32"
425                 PREFIX="-DPREFIX"                 fi
426                   PREFIX="-DWINDOWS"
427                 MARK_FUNCS=""                 MARK_FUNCS=""
428                 ;;                 ;;
429             *darwin*)             *darwin*)
# Line 417  Line 436 
436    
437         AS="$chosen_asm_prog"         AS="$chosen_asm_prog"
438         ASSEMBLY_EXTENSION="asm"         ASSEMBLY_EXTENSION="asm"
439         AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"         AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
440         ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"         ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
441         if test "$ARCHITECTURE" = "X86_64" ; then         if test "$ARCHITECTURE" = "X86_64" ; then
442                 AFLAGS=${AFLAGS}" -m amd64"                 AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
443         fi         fi
444     else     else
445         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])
# Line 436  Line 455 
455  dnl and GNU gcc with very slight changes to code which can be sumed up by:  dnl and GNU gcc with very slight changes to code which can be sumed up by:
456  dnl  dnl
457  dnl Apple:  dnl Apple:
458  dnl  - compile with the option -faltivec  dnl  - compile with the option -arch ppc -faltivec
459  dnl  - define vectors with parentheses vec = (0,0,0,0)  dnl  - define vectors with parentheses vec = (0,0,0,0)
460  dnl GNU  dnl GNU
461  dnl  - compile with -maltivec -mabi=altivec  dnl  - compile with -maltivec -mabi=altivec
# Line 461  Line 480 
480  #include <altivec.h>  #include <altivec.h>
481  int main() { return(0); }  int main() { return(0); }
482  EOF  EOF
483     if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \     if $CC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \
484        $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then        $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
485          AC_MSG_RESULT(yes)          AC_MSG_RESULT(yes)
486          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"
# Line 485  Line 504 
504    return(0);    return(0);
505  }  }
506  EOF  EOF
507     if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then     if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
508          AC_MSG_RESULT([yes (Apple)])          AC_MSG_RESULT([yes (Apple)])
509          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
510          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
511     else     else
512  cat > conftest.c << EOF  cat > conftest.c << EOF
Legend:
Removed from v.1794  
changed lines
  Added in v.1870
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4