From 061e92e4a6f2f9fa15a245361552486af2b55090 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 8 Mar 2009 09:49:04 +0000 Subject: regen --- app/xauth/configure | 188 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 166 insertions(+), 22 deletions(-) (limited to 'app/xauth/configure') diff --git a/app/xauth/configure b/app/xauth/configure index deaec0d9d..238351b73 100644 --- a/app/xauth/configure +++ b/app/xauth/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xauth 1.0.2. +# Generated by GNU Autoconf 2.59 for xauth 1.0.3. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xauth' PACKAGE_TARNAME='xauth' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='xauth 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='xauth 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -791,7 +791,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 xauth 1.0.2 to adapt to many kinds of systems. +\`configure' configures xauth 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -857,7 +857,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xauth 1.0.2:";; + short | recursive ) echo "Configuration of xauth 1.0.3:";; esac cat <<\_ACEOF @@ -870,7 +870,7 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --enable-unix-transport Enable UNIX domain socket transport --enable-tcp-transport Enable TCP socket transport - --enable-IPv6 Enable IPv6 support + --enable-ipv6 Enable IPv6 support --enable-local-transport Enable os-specific local transport @@ -994,7 +994,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xauth configure 1.0.2 +xauth configure 1.0.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1008,7 +1008,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xauth $as_me 1.0.2, which was +It was created by xauth $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1606,7 +1606,7 @@ fi # Define the identity of the package. PACKAGE='xauth' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -1772,7 +1772,7 @@ fi XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'` echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5 echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6 - XORG_MACROS_version=1.1.5 + XORG_MACROS_version=1.2.1 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'` if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -3962,19 +3962,16 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + case $host_os in + mingw*) unixdef="no" ;; + *) unixdef="yes" ;; + esac # Check whether --enable-unix-transport or --disable-unix-transport was given. if test "${enable_unix_transport+set}" = set; then enableval="$enable_unix_transport" UNIXCONN=$enableval else - UNIXCONN=yes -fi; - # Check whether --enable-tcp-transport or --disable-tcp-transport was given. -if test "${enable_tcp_transport+set}" = set; then - enableval="$enable_tcp_transport" - TCPCONN=$enableval -else - TCPCONN=yes + UNIXCONN=$unixdef fi; echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5 echo $ECHO_N "checking if Xtrans should support UNIX socket connections... $ECHO_C" >&6 @@ -3987,6 +3984,13 @@ _ACEOF fi echo "$as_me:$LINENO: result: $UNIXCONN" >&5 echo "${ECHO_T}$UNIXCONN" >&6 + # Check whether --enable-tcp-transport or --disable-tcp-transport was given. +if test "${enable_tcp_transport+set}" = set; then + enableval="$enable_tcp_transport" + TCPCONN=$enableval +else + TCPCONN=yes +fi; echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5 echo $ECHO_N "checking if Xtrans should support TCP socket connections... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $TCPCONN" >&5 @@ -4252,6 +4256,75 @@ if test "$ac_cv_search_gethostbyname" != no; then fi +echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 +echo $ECHO_N "checking for main in -lws2_32... $ECHO_C" >&6 +if test "${ac_cv_lib_ws2_32_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lws2_32 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ws2_32_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ws2_32_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_ws2_32_main" >&6 +if test $ac_cv_lib_ws2_32_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBWS2_32 1 +_ACEOF + + LIBS="-lws2_32 $LIBS" + +fi +ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main + + # Needs to come after above checks for libsocket & libnsl for SVR4 systems # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -4488,6 +4561,77 @@ _ACEOF fi + # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. + echo "$as_me:$LINENO: checking for socklen_t" >&5 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 +if test "${ac_cv_type_socklen_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +$ac_includes_default +#include + +int +main () +{ +if ((socklen_t *) 0) + return 0; +if (sizeof (socklen_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_socklen_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_socklen_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 +echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 +if test $ac_cv_type_socklen_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_SOCKLEN_T 1 +_ACEOF + + +fi + + + fi case $host_os in solaris*|sco*|sysv4*) localdef="yes" ;; @@ -4647,7 +4791,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi @@ -4656,7 +4800,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MINOR $PVM _ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi @@ -5058,7 +5202,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xauth $as_me 1.0.2, which was +This file was extended by xauth $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5121,7 +5265,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xauth config.status 1.0.2 +xauth config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -- cgit v1.2.3