[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 1971, Wed Apr 6 14:30:14 2011 UTC revision 2033, Wed Sep 14 15:09:32 2011 UTC
# Line 237  Line 237 
237  STATIC_EXTENSION=""  STATIC_EXTENSION=""
238  OBJECT_EXTENSION=""  OBJECT_EXTENSION=""
239  case "$target_os" in  case "$target_os" in
240       *bsd*|linux*|beos|irix*|solaris*)       *bsd*|linux*|beos|irix*|solaris*|gnu*)
241          AC_MSG_RESULT([.so .a .o])          AC_MSG_RESULT([.so .a .o])
242          STATIC_EXTENSION="a"          STATIC_EXTENSION="a"
243          SHARED_EXTENSION="so"          SHARED_EXTENSION="so"
# Line 281  Line 281 
281  ALTIVEC_CFLAGS=""  ALTIVEC_CFLAGS=""
282  PRE_SHARED_LIB=""  PRE_SHARED_LIB=""
283  case "$target_os" in  case "$target_os" in
284       linux*|solaris*)       linux*|solaris*|gnu*)
285          AC_MSG_RESULT([ok])          AC_MSG_RESULT([ok])
286          STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"          STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
287          SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"          SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
# Line 299  Line 299 
299          AC_MSG_RESULT([ok])          AC_MSG_RESULT([ok])
300          STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"          STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
301          SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"          SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
302          SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"          SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
303          SPECIFIC_CFLAGS="-mno-cygwin"          SPECIFIC_CFLAGS=""
304          ;;          ;;
305       darwin*|raphsody*)       darwin*|raphsody*)
306          STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"          STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
# Line 419  Line 419 
419     if test "$found_nasm_comp_prog" = "yes" ; then     if test "$found_nasm_comp_prog" = "yes" ; then
420         AC_MSG_CHECKING([for asm object format])         AC_MSG_CHECKING([for asm object format])
421         case "$target_os" in         case "$target_os" in
422             *bsd*|linux*|beos|irix*|solaris*)             *bsd*|linux*|beos|irix*|solaris*|gnu*)
423                 if test "$ARCHITECTURE" = "X86_64" ; then                 if test "$ARCHITECTURE" = "X86_64" ; then
424                     AC_MSG_RESULT([elf64])                     AC_MSG_RESULT([elf64])
425                     NASM_FORMAT="elf64"                     NASM_FORMAT="elf64"
# Line 649  Line 649 
649  dnl ==========================================================================  dnl ==========================================================================
650    
651  if test "$GCC" = "yes" ; then  if test "$GCC" = "yes" ; then
 cat << EOF > test.c  
 #include <stdio.h>  
 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`  
652    
653          rm -f test.c          GCC_MAJOR=`$CC -dumpversion | cut -d . -f 1`
654          rm -f gcc-ver          GCC_MINOR=`$CC -dumpversion | cut -d . -f 2`
655    
656          # GCC 4.x          # GCC 4.x
657          if test "${GCC_MAJOR}" -gt 3 ; then          if test "${GCC_MAJOR}" -gt 3 ; then
# Line 707  Line 690 
690  AC_SUBST(ASSEMBLY_SOURCES)  AC_SUBST(ASSEMBLY_SOURCES)
691  AC_SUBST(CC)  AC_SUBST(CC)
692  AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
693    AC_SUBST(LDFLAGS)
694  AC_SUBST(SPECIFIC_LDFLAGS)  AC_SUBST(SPECIFIC_LDFLAGS)
695  AC_SUBST(SPECIFIC_CFLAGS)  AC_SUBST(SPECIFIC_CFLAGS)
696  AC_SUBST(DCT_IA64_SOURCES)  AC_SUBST(DCT_IA64_SOURCES)
Legend:
Removed from v.1971  
changed lines
  Added in v.2033
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4