RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master' 

* cehoyos/master:
  Fix hardware detection on aix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-13 15:00:49 +01:00
parent bb6de15d92 aac9e56759
commit f385a099c1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2505,14 +2505,18 @@ windres_default="windres"
nogas=":" nogas=":"
# machine
arch_default=$(uname -m)
cpu="generic"
# OS # OS
target_os_default=$(tolower $(uname -s)) target_os_default=$(tolower $(uname -s))
host_os=$target_os_default host_os=$target_os_default
# machine
if test "$target_os_default" = aix; then
arch_default=$(uname -p)
else
arch_default=$(uname -m)
fi
cpu="generic"
# configurable options # configurable options
enable $PROGRAM_LIST enable $PROGRAM_LIST
enable $DOCUMENT_LIST enable $DOCUMENT_LIST