Revision 3ae3b721

View differences:

configure
1447 1447

  
1448 1448
# AltiVec flags: The FSF version of GCC differs from the Apple version
1449 1449
if enabled altivec; then
1450
    if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
1451
        add_cflags "-faltivec"
1452
    else
1450
    test -n "`$cc -v 2>&1 | grep version | grep Apple`" &&
1451
        add_cflags "-faltivec" ||
1453 1452
        add_cflags "-maltivec -mabi=altivec"
1454
    fi
1455 1453

  
1456 1454
    check_header altivec.h
1457 1455

  
1458 1456
    # check if our compiler supports Motorola AltiVec C API
1459
    if enabled altivec_h; then
1460
        inc_altivec_h="#include <altivec.h>"
1461
    else
1457
    enabled altivec_h &&
1458
        inc_altivec_h="#include <altivec.h>" ||
1462 1459
        inc_altivec_h=
1463
    fi
1464 1460
    check_cc <<EOF || disable altivec
1465 1461
$inc_altivec_h
1466 1462
int main(void) {
......
1551 1547

  
1552 1548
for thread in $THREADS_LIST; do
1553 1549
    if enabled $thread; then
1554
        if test -n "$thread_type"; then
1555
            die "ERROR: Only one thread type must be selected."
1556
        else
1550
        test -n "$thread_type" &&
1551
            die "ERROR: Only one thread type must be selected." ||
1557 1552
            thread_type="$thread"
1558
        fi
1559 1553
    fi
1560 1554
done
1561 1555

  
......
1852 1846
echo "x264 enabled              ${libx264-no}"
1853 1847
echo "XviD enabled              ${libxvid-no}"
1854 1848
echo "zlib enabled              ${zlib-no}"
1855
if ! enabled gpl; then
1849
enabled gpl &&
1850
    echo "License: GPL" ||
1856 1851
    echo "License: LGPL"
1857
else
1858
    echo "License: GPL"
1859
fi
1860 1852

  
1861 1853
echo "Creating config.mak and config.h..."
1862 1854

  
......
1876 1868
echo "AR=$ar" >> config.mak
1877 1869
echo "RANLIB=$ranlib" >> config.mak
1878 1870
echo "LN_S=$ln_s" >> config.mak
1879
if enabled dostrip; then
1880
    echo "STRIP=$strip" >> config.mak
1881
else
1871
enabled dostrip &&
1872
    echo "STRIP=$strip" >> config.mak ||
1882 1873
    echo "STRIP=echo ignoring strip" >> config.mak
1883
fi
1884 1874

  
1885 1875
echo "OPTFLAGS=$CFLAGS" >> config.mak
1886 1876
echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
......
1968 1958
echo "BUILD_ROOT=\"$PWD\"" >> config.mak
1969 1959

  
1970 1960
# Apparently it's not possible to portably echo a backslash.
1971
if enabled asmalign_pot; then
1972
  printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH
1973
else
1961
enabled asmalign_pot &&
1962
  printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
1974 1963
  printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH
1975
fi
1976 1964

  
1977 1965

  
1978 1966
# Do not overwrite config.h if unchanged to avoid superfluous rebuilds.
1979
if ! cmp -s $TMPH config.h; then
1980
        mv -f $TMPH config.h
1981
else
1982
        echo "config.h is unchanged"
1983
fi
1967
cmp -s $TMPH config.h &&
1968
    echo "config.h is unchanged" ||
1969
    mv -f $TMPH config.h
1984 1970

  
1985 1971
rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
1986 1972

  

Also available in: Unified diff