diff options
Diffstat (limited to 'xorg-server/configure')
| -rw-r--r-- | xorg-server/configure | 97 |
1 files changed, 59 insertions, 38 deletions
diff --git a/xorg-server/configure b/xorg-server/configure index 74af775ac..50b8250a5 100644 --- a/xorg-server/configure +++ b/xorg-server/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for xorg-server 1.7.99.902. +# Generated by GNU Autoconf 2.65 for xorg-server 1.8.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -702,8 +702,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.7.99.902' -PACKAGE_STRING='xorg-server 1.7.99.902' +PACKAGE_VERSION='1.8.0' +PACKAGE_STRING='xorg-server 1.8.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -887,6 +887,7 @@ DEFAULT_MODULE_PATH __XCONFIGDIR__ XF86CONFIGFILE __XCONFIGFILE__ +XF86CONFIGDIR XORG_CFLAGS PERL XORG_OS_SUBDIR @@ -1083,6 +1084,7 @@ ARM_VIDEO_TRUE ALPHA_VIDEO_FALSE ALPHA_VIDEO_TRUE GLX_ARCH_DEFINES +ARM_BACKTRACE_CFLAGS BSD_KQUEUE_APM_FALSE BSD_KQUEUE_APM_TRUE BSD_APM_FALSE @@ -1986,7 +1988,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 xorg-server 1.7.99.902 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2056,7 +2058,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.7.99.902:";; + short | recursive ) echo "Configuration of xorg-server 1.8.0:";; esac cat <<\_ACEOF @@ -2120,7 +2122,7 @@ Optional Features: --disable-dbe Build DBE extension (default: enabled) --disable-xf86bigfont Build XF86 Big Font extension (default: disabled) --disable-dpms Build DPMS extension (default: enabled) - --enable-config-udev Build udev support (default: no) + --enable-config-udev Build udev support (default: auto) --enable-config-dbus Build D-BUS API support (default: no) --disable-config-hal Build HAL support (default: auto) --enable-xfree86-utils Build xfree86 DDX utilities (default: enabled) @@ -2420,7 +2422,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.7.99.902 +xorg-server configure 1.8.0 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -3119,7 +3121,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 xorg-server $as_me 1.7.99.902, which was +It was created by xorg-server $as_me 1.8.0, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3466,7 +3468,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2010-03-21" +RELEASE_DATE="2010-04-02" am__api_version='1.11' @@ -3929,7 +3931,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.7.99.902' + VERSION='1.8.0' cat >>confdefs.h <<_ACEOF @@ -7728,13 +7730,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:7731: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7733: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7734: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7736: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7737: output\"" >&5) + (eval echo "\"\$as_me:7739: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8925,7 +8927,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8928 "configure"' > conftest.$ac_ext + echo '#line 8930 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10155,11 +10157,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:10158: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10160: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10162: \$? = $ac_status" >&5 + echo "$as_me:10164: \$? = $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. @@ -10494,11 +10496,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:10497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10499: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10501: \$? = $ac_status" >&5 + echo "$as_me:10503: \$? = $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. @@ -10599,11 +10601,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:10602: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10604: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10606: \$? = $ac_status" >&5 + echo "$as_me:10608: \$? = $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 @@ -10654,11 +10656,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:10657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10659: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10661: \$? = $ac_status" >&5 + echo "$as_me:10663: \$? = $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 @@ -13038,7 +13040,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13041 "configure" +#line 13043 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13134,7 +13136,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13137 "configure" +#line 13139 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15848,6 +15850,29 @@ fi +old_CFLAGS="$CFLAGS" +CFLAGS="-mapcs-frame" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ARM_BACKTRACE_CFLAGS="$CFLAGS" +else + ARM_BACKTRACE_CFLAGS="" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$old_CFLAGS" + + DEFAULT_INT10="x86emu" @@ -16656,7 +16681,7 @@ fi if test "${enable_config_udev+set}" = set; then : enableval=$enable_config_udev; CONFIG_UDEV=$enableval else - CONFIG_UDEV=no + CONFIG_UDEV=auto fi # Check whether --enable-config-dbus was given. @@ -19126,6 +19151,9 @@ MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' # XINPUT extension is integral part of the server + +$as_echo "#define XINPUT 1" >>confdefs.h + XI_LIB='$(top_builddir)/Xi/libXi.la' XI_INC='-I$(top_srcdir)/Xi' @@ -20365,17 +20393,9 @@ UTILS_SYS_LIBS="${SYS_LIBS}" # The Xorg binary needs to export symbols so that they can be used from modules -# Some platforms require extra flags to do this. gcc should set these flags -# when -rdynamic is passed to it, other compilers/linkers may need to be added -# here. -if test "x$GCC" = "xyes"; then - LD_EXPORT_SYMBOLS_FLAG="-rdynamic" -fi -case $host_os in - openbsd*) - LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" - ;; -esac +# Some platforms require extra flags to do this. libtool should set the +# necessary flags for each platform when -export-dynamic is passed to it. +LD_EXPORT_SYMBOLS_FLAG="-export-dynamic" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5 @@ -21418,6 +21438,7 @@ fi XF86CONFIGFILE="xorg.conf" XF86CONFIGDIR="xorg.conf.d" + CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" LOGPREFIX="$logdir/Xorg." @@ -24652,7 +24673,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 xorg-server $as_me 1.7.99.902, which was +This file was extended by xorg-server $as_me 1.8.0, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24718,7 +24739,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="\\ -xorg-server config.status 1.7.99.902 +xorg-server config.status 1.8.0 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" |