diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 39 |
1 files changed, 20 insertions, 19 deletions
@@ -1427,8 +1427,7 @@ else echores "$cc_version" break fi - cc_name_tmp=$($_cc -v 2>&1 | head -n 1 | cut -d ' ' -f 1) - if test "$cc_name_tmp" = "clang"; then + if $_cc -v 2>&1 | grep -q "clang"; then echocheck "$_cc version" cc_vendor=clang cc_version=$($_cc -dumpversion 2>&1) @@ -1449,6 +1448,10 @@ else fi # icc test "$cc_fail" = yes && die "unsupported compiler version" +echocheck "working compiler" +cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." +echo "yes" + if test -z "$_target" && x86 ; then cat > $TMPC << EOF int main(void) { @@ -1462,10 +1465,6 @@ fi echo "Detected operating system: $system_name" echo "Detected host architecture: $host_arch" -echocheck "host cc" -test "$_host_cc" || _host_cc=$_cc -echores $_host_cc - echocheck "cross compilation" if test $_cross_compile = auto ; then _cross_compile=yes @@ -1477,8 +1476,13 @@ if test $_cross_compile = yes; then tmp_run() { return 0 } + test "$_host_cc" || _host_cc=cc fi +echocheck "host cc" +test "$_host_cc" || _host_cc=$_cc +echores $_host_cc + # --- # now that we know what compiler should be used for compilation, try to find @@ -1533,14 +1537,13 @@ if x86 ; then pparam=$(echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \ -e s/xmm/sse/ -e s/kni/sse/) + # SSE implies MMX2, but not all SSE processors report the mmxext CPU flag. + pparam=$(echo $pparam | sed -e 's/sse/sse mmxext/') for ext in $pparam ; do eval test \"\$_$ext\" = auto 2>/dev/null && eval _$ext=kernel_check done - # SSE implies MMX2, but not all SSE processors report the mmxext CPU flag. - test $_sse = kernel_check && _mmxext=kernel_check - echocheck "CPU vendor" echores "$pvendor ($pfamily:$pmodel:$pstepping)" @@ -2555,11 +2558,6 @@ echores "$xform_asm" fi if arm ; then - echocheck "ARM pld instruction" - pld=no - inline_asm_check '"pld [r0]"' && pld=yes - echores "$pld" - echocheck "ARMv5TE (Enhanced DSP Extensions)" if test $_armv5te = "auto" ; then _armv5te=no @@ -2605,7 +2603,7 @@ if arm ; then echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMVFP NEON IWMMXT MMI VIS MVI' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -2617,7 +2615,6 @@ test "$_ssse3" = yes && cpuexts="SSSE3 $cpuexts" test "$_cmov" = yes && cpuexts="CMOV $cpuexts" test "$_fast_cmov" = yes && cpuexts="FAST_CMOV $cpuexts" test "$_fast_clz" = yes && cpuexts="FAST_CLZ $cpuexts" -test "$pld" = yes && cpuexts="PLD $cpuexts" test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts" test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts" test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" @@ -3500,12 +3497,15 @@ echores "$_gettimeofday" echocheck "glob()" _glob=no statement_check glob.h 'glob("filename", 0, 0, 0)' && _glob=yes +need_glob=no if test "$_glob" = yes ; then def_glob='#define HAVE_GLOB 1' - need_glob=no else def_glob='#undef HAVE_GLOB' - need_glob=yes + # HACK! need_glob currently enables compilation of a + # win32-specific glob()-replacement. + # Other OS neither need it nor can they use it (mf:// is disabled for them). + win32 && need_glob=yes fi echores "$_glob" @@ -3546,7 +3546,7 @@ fi #if sunos echocheck "sys/sysinfo.h" _sys_sysinfo=no -statement_check sys/sysinfo.h 'struct sysinfo s_info; sysinfo(&s_info)' && _sys_sysinfo=yes +statement_check sys/sysinfo.h 'struct sysinfo s_info; s_info.mem_unit=0; sysinfo(&s_info)' && _sys_sysinfo=yes if test "$_sys_sysinfo" = yes ; then def_sys_sysinfo_h='#define HAVE_SYS_SYSINFO_H 1' else @@ -5342,6 +5342,7 @@ if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then def_libcdio='#define CONFIG_LIBCDIO 1' def_havelibcdio='yes' else + _libcdio=no if test "$_cdparanoia" = yes ; then res_comment="using cdparanoia" fi |