diff options
Diffstat (limited to 'pixman/configure')
| -rw-r--r-- | pixman/configure | 117 |
1 files changed, 51 insertions, 66 deletions
diff --git a/pixman/configure b/pixman/configure index 82da71bb1..ffba51473 100644 --- a/pixman/configure +++ b/pixman/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for pixman 0.17.12. +# Generated by GNU Autoconf 2.65 for pixman 0.18.0. # # Report bugs to <"pixman@lists.freedesktop.org">. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pixman' PACKAGE_TARNAME='pixman' -PACKAGE_VERSION='0.17.12' -PACKAGE_STRING='pixman 0.17.12' +PACKAGE_VERSION='0.18.0' +PACKAGE_STRING='pixman 0.18.0' PACKAGE_BUGREPORT='"pixman@lists.freedesktop.org"' PACKAGE_URL='' @@ -763,7 +763,6 @@ USE_ARM_NEON_FALSE USE_ARM_NEON_TRUE USE_ARM_SIMD_FALSE USE_ARM_SIMD_TRUE -ARM_SIMD_CFLAGS USE_VMX_FALSE USE_VMX_TRUE VMX_CFLAGS @@ -1467,7 +1466,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pixman 0.17.12 to adapt to many kinds of systems. +\`configure' configures pixman 0.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1537,7 +1536,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pixman 0.17.12:";; + short | recursive ) echo "Configuration of pixman 0.18.0:";; esac cat <<\_ACEOF @@ -1652,7 +1651,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pixman configure 0.17.12 +pixman configure 0.18.0 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2147,7 +2146,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pixman $as_me 0.17.12, which was +It was created by pixman $as_me 0.18.0, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2955,7 +2954,7 @@ fi # Define the identity of the package. PACKAGE='pixman' - VERSION='0.17.12' + VERSION='0.18.0' cat >>confdefs.h <<_ACEOF @@ -4808,13 +4807,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4811: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4810: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4814: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4813: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4817: output\"" >&5) + (eval echo "\"\$as_me:4816: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6020,7 +6019,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6023 "configure"' > conftest.$ac_ext + echo '#line 6022 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7546,11 +7545,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7549: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7548: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7553: \$? = $ac_status" >&5 + echo "$as_me:7552: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7885,11 +7884,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7888: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7887: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7892: \$? = $ac_status" >&5 + echo "$as_me:7891: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7990,11 +7989,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7992: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7997: \$? = $ac_status" >&5 + echo "$as_me:7996: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8045,11 +8044,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8047: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8052: \$? = $ac_status" >&5 + echo "$as_me:8051: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10415,7 +10414,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10418 "configure" +#line 10417 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10511,7 +10510,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10514 "configure" +#line 10513 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11087,13 +11086,13 @@ fi -LT_VERSION_INFO="17:12:17" +LT_VERSION_INFO="18:0:18" PIXMAN_VERSION_MAJOR=0 -PIXMAN_VERSION_MINOR=17 +PIXMAN_VERSION_MINOR=18 -PIXMAN_VERSION_MICRO=12 +PIXMAN_VERSION_MICRO=0 @@ -11464,44 +11463,30 @@ else fi -ARM_SIMD_CFLAGS="" - have_arm_simd=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ARM SIMD assembler" >&5 $as_echo_n "checking whether to use ARM SIMD assembler... " >&6; } -# check with default CFLAGS in case the toolchain turns on a sufficiently recent -mcpu= +xserver_save_CFLAGS=$CFLAGS +CFLAGS="-x assembler-with-cpp $CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main () { - asm("uqadd8 r1, r1, r2"); - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - have_arm_simd=yes -else - # check again with an explicit -mcpu= in case the toolchain defaults to an - # older one; note that uqadd8 isn't available in Thumb mode on arm1136j-s - # so we force ARM mode - ARM_SIMD_CFLAGS="-mcpu=arm1136j-s -marm" - xserver_save_CFLAGS=$CFLAGS - CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - int main () { - asm("uqadd8 r1, r1, r2"); - return 0; - } +.text +.arch armv6 +.object_arch armv4 +.arm +.altmacro +#ifndef __ARM_EABI__ +#error EABI is required (to be sure that calling conventions are compatible) +#endif +pld [r0] +uqadd8 r0, r0, r0 _ACEOF if ac_fn_c_try_compile "$LINENO"; then : have_arm_simd=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$xserver_save_CFLAGS -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=$xserver_save_CFLAGS # Check whether --enable-arm-simd was given. if test "${enable_arm_simd+set}" = set; then : @@ -11519,18 +11504,8 @@ if test $have_arm_simd = yes ; then $as_echo "#define USE_ARM_SIMD 1" >>confdefs.h -else - ARM_SIMD_CFLAGS= -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_arm_simd" >&5 -$as_echo "$have_arm_simd" >&6; } -if test $enable_arm_simd = yes && test $have_arm_simd = no ; then - as_fn_error "ARM SIMD intrinsics not detected" "$LINENO" 5 fi - - if test $have_arm_simd = yes; then USE_ARM_SIMD_TRUE= USE_ARM_SIMD_FALSE='#' @@ -11540,16 +11515,26 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_arm_simd" >&5 +$as_echo "$have_arm_simd" >&6; } +if test $enable_arm_simd = yes && test $have_arm_simd = no ; then + as_fn_error "ARM SIMD intrinsics not detected" "$LINENO" 5 +fi + have_arm_neon=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ARM NEON assembler" >&5 $as_echo_n "checking whether to use ARM NEON assembler... " >&6; } xserver_save_CFLAGS=$CFLAGS -CFLAGS="-x assembler-with-cpp" +CFLAGS="-x assembler-with-cpp $CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ .text .fpu neon +.arch armv7a +.object_arch armv4 +.eabi_attribute 10, 0 +.arm .altmacro #ifndef __ARM_EABI__ #error EABI is required (to be sure that calling conventions are compatible) @@ -12573,7 +12558,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pixman $as_me 0.17.12, which was +This file was extended by pixman $as_me 0.18.0, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12639,7 +12624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pixman config.status 0.17.12 +pixman config.status 0.18.0 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" |