[svn] / branches / release-1_3-branch / xvidcore / build / generic / configure.in Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/build/generic/configure.in

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

revision 1821, Fri Nov 28 18:16:42 2008 UTC revision 1878, Mon Oct 5 09:55:46 2009 UTC
# Line 13  Line 13 
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_yasm_minor_version=8
20  minimum_nasm_minor_version=0  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"
24    
25  dnl Default CFLAGS -- Big impact on overall speed  dnl Default CFLAGS -- Big impact on overall speed
26  our_cflags_defaults="-Wall"  our_cflags_defaults="-Wall"
# Line 262  Line 264 
264  AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)  AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)
265  SPECIFIC_LDFLAGS=""  SPECIFIC_LDFLAGS=""
266  SPECIFIC_CFLAGS=""  SPECIFIC_CFLAGS=""
267    ALTIVEC_CFLAGS=""
268  PRE_SHARED_LIB=""  PRE_SHARED_LIB=""
269  case "$target_os" in  case "$target_os" in
270       linux*|solaris*)       linux*|solaris*)
# Line 291  Line 294 
294          if test x"$macosx_module" = x"no"; then          if test x"$macosx_module" = x"no"; then
295             AC_MSG_RESULT([dylib options])             AC_MSG_RESULT([dylib options])
296             SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"             SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
297             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)"
298          else          else
299             AC_MSG_RESULT([module options])             AC_MSG_RESULT([module options])
300             PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"             PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
# Line 345  Line 348 
348     found_nasm_comp_prog="no"     found_nasm_comp_prog="no"
349     chosen_asm_prog=""     chosen_asm_prog=""
350    
351       dnl Check for yasm first
352       AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes])
353       if test "$ac_yasm" = "yes" ; then
354           dnl
355           dnl Checking yasm version
356           dnl
357           AC_MSG_CHECKING([for yasm version])
358           yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
359           if test -z $yasm_minor ; then
360              yasm_minor=-1
361           fi
362           AC_MSG_RESULT([$yasm_minor])
363    
364           dnl Actually, yasm >= 0.7.99.2161 should be ok
365           dnl But I'm too lazy to check also the patch version...
366           if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then
367             AC_MSG_WARN([yasm version is too old])
368           else
369             found_nasm_comp_prog="yes"
370             chosen_asm_prog="$yasm_prog"
371           fi
372       fi
373    
374     dnl Check for nasm (not buggy version)     dnl Check for nasm (not buggy version)
375     if test "$found_nasm_comp_prog" = "no" ; then     if test "$found_nasm_comp_prog" = "no" ; then
376         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
# Line 430  Line 456 
456  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:
457  dnl  dnl
458  dnl Apple:  dnl Apple:
459  dnl  - compile with the option -faltivec  dnl  - compile with the option -arch ppc -faltivec
460  dnl  - define vectors with parentheses vec = (0,0,0,0)  dnl  - define vectors with parentheses vec = (0,0,0,0)
461  dnl GNU  dnl GNU
462  dnl  - compile with -maltivec -mabi=altivec  dnl  - compile with -maltivec -mabi=altivec
# Line 455  Line 481 
481  #include <altivec.h>  #include <altivec.h>
482  int main() { return(0); }  int main() { return(0); }
483  EOF  EOF
484     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 || \
485        $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
486          AC_MSG_RESULT(yes)          AC_MSG_RESULT(yes)
487          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"
# Line 479  Line 505 
505    return(0);    return(0);
506  }  }
507  EOF  EOF
508     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
509          AC_MSG_RESULT([yes (Apple)])          AC_MSG_RESULT([yes (Apple)])
510          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
511          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
512     else     else
513  cat > conftest.c << EOF  cat > conftest.c << EOF
# Line 499  Line 525 
525  EOF  EOF
526     if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then     if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
527          AC_MSG_RESULT([yes (GNU)])          AC_MSG_RESULT([yes (GNU)])
528          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
529          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"          PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
530            ALTIVEC_CFLAGS="-maltivec -mabi=altivec"
531     else     else
532          AC_MSG_RESULT([no (ppc support won't be compiled in)])          AC_MSG_RESULT([no (ppc support won't be compiled in)])
533          dnl Only C code can be compiled :-(          dnl Only C code can be compiled :-(
# Line 564  Line 591 
591          AC_CHECK_LIB(          AC_CHECK_LIB(
592                  pthread,                  pthread,
593                  pthread_create,                  pthread_create,
                 AC_CHECK_LIB(  
                         pthread,  
                         pthread_join,  
594                          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"                          SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
595                          SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",                          SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
596                          AC_MSG_WARN(Pthread not supported. No SMP support)),                          AC_MSG_WARN(Pthread not supported. No SMP support)),
                 AC_MSG_WARN(Pthread not supported. No SMP support)),  
597          AC_MSG_WARN(Pthread not supported. No SMP support))          AC_MSG_WARN(Pthread not supported. No SMP support))
598    
599  dnl ==========================================================================  dnl ==========================================================================
# Line 671  Line 694 
694  AC_SUBST(STATIC_LIB)  AC_SUBST(STATIC_LIB)
695  AC_SUBST(PRE_SHARED_LIB)  AC_SUBST(PRE_SHARED_LIB)
696  AC_SUBST(SHARED_LIB)  AC_SUBST(SHARED_LIB)
697    AC_SUBST(ALTIVEC_CFLAGS)
698    
699  dnl ==========================================================================  dnl ==========================================================================
700  dnl  dnl
Legend:
Removed from v.1821  
changed lines
  Added in v.1878
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4