[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

trunk/xvidcore/build/generic/configure.in revision 1878, Mon Oct 5 09:55:46 2009 UTC branches/release-1_3-branch/xvidcore/build/generic/configure.in revision 1944, Tue Jan 11 11:39:13 2011 UTC
# Line 16  Line 16 
16  API_MINOR="3"  API_MINOR="3"
17    
18  dnl NASM/YASM version requirement  dnl NASM/YASM version requirement
19  minimum_yasm_minor_version=8  minimum_yasm_major_version=1
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"
# Line 128  Line 128 
128  dnl ==========================================================================  dnl ==========================================================================
129    
130  AC_PROG_RANLIB  AC_PROG_RANLIB
131    AC_CHECK_TOOL([AR], [ar], [ar-not-found])
132    
133  dnl ==========================================================================  dnl ==========================================================================
134  dnl  dnl
# Line 355  Line 356 
356         dnl Checking yasm version         dnl Checking yasm version
357         dnl         dnl
358         AC_MSG_CHECKING([for yasm version])         AC_MSG_CHECKING([for yasm version])
359         yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`         yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
360         if test -z $yasm_minor ; then         if test -z $yasm_major ; then
361            yasm_minor=-1            yasm_major=-1
362         fi         fi
363         AC_MSG_RESULT([$yasm_minor])         AC_MSG_RESULT([$yasm_major])
364    
365         dnl Actually, yasm >= 0.7.99.2161 should be ok         dnl Actually, yasm >= 0.7.99.2161 should be ok
366         dnl But I'm too lazy to check also the patch version...         dnl But I'm too lazy to check also the patch version...
367         if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then         if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
368           AC_MSG_WARN([yasm version is too old])           AC_MSG_WARN([yasm version is too old])
369         else         else
370           found_nasm_comp_prog="yes"           found_nasm_comp_prog="yes"
# Line 428  Line 429 
429                 MARK_FUNCS=""                 MARK_FUNCS=""
430                 ;;                 ;;
431             *darwin*)             *darwin*)
432                 AC_MSG_RESULT([macho])                 if test "$ARCHITECTURE" = "X86_64" ; then
433                 NASM_FORMAT="macho"                     AC_MSG_RESULT([macho64])
434                       NASM_FORMAT="macho64"
435                   else
436                       AC_MSG_RESULT([macho32])
437                       NASM_FORMAT="macho32"
438                   fi
439                 PREFIX="-DPREFIX"                 PREFIX="-DPREFIX"
440                 MARK_FUNCS=""                 MARK_FUNCS=""
441                 ;;                 ;;
# Line 689  Line 695 
695  AC_SUBST(DCT_IA64_SOURCES)  AC_SUBST(DCT_IA64_SOURCES)
696  AC_SUBST(PPC_ALTIVEC_SOURCES)  AC_SUBST(PPC_ALTIVEC_SOURCES)
697  AC_SUBST(RANLIB)  AC_SUBST(RANLIB)
698    AC_SUBST(AR)
699  AC_SUBST(API_MAJOR)  AC_SUBST(API_MAJOR)
700  AC_SUBST(API_MINOR)  AC_SUBST(API_MINOR)
701  AC_SUBST(STATIC_LIB)  AC_SUBST(STATIC_LIB)
Legend:
Removed from v.1878  
changed lines
  Added in v.1944
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4