diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 585c8ef57f..22c96f5b6f 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -99,8 +99,8 @@ cd $PKG_BUILD --with-xkb-output=/var/cache/xkb \ --with-log-dir=/var/log \ --with-dri-driver-path=$XORG_PATH_DRI \ - --with-fontdir=$XORG_PATH_FONTS \ - --with-default-font-path="$XORG_PATH_FONTS/misc" \ + --with-fontrootdir=$XORG_PATH_FONTS \ + --with-default-font-path=$XORG_PATH_FONTS/misc \ $XORG_CONFIG \ make diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg index ee39f37989..c908b093ba 100644 --- a/packages/x11/xserver/xorg-server/conf.d/xorg +++ b/packages/x11/xserver/xorg-server/conf.d/xorg @@ -40,7 +40,7 @@ export DISPLAY fi mkdir -p /var/cache/xkb - exec /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 & + /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 & } wait_for_xorg () { diff --git a/packages/x11/xserver/xorg-server/config/70-xorg.rules b/packages/x11/xserver/xorg-server/config/70-xorg.rules deleted file mode 100644 index 982f432fc3..0000000000 --- a/packages/x11/xserver/xorg-server/config/70-xorg.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="input", KERNEL=="event*", ENV{x11_driver}="evdev" -SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="us", ENV{xkb.options}="terminate:ctrl_alt_bksp,compose:lwin" diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 138c3fdd9f..c485dcfebf 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -13,8 +13,6 @@ $SCRIPTS/install $MESA $SCRIPTS/install pixman $SCRIPTS/install udev -PKG_DIR=`find $PACKAGES -type d -name $1` - XORG_SRC="$PKG_BUILD/hw/xfree86" XORG_DST="$INSTALL/$XORG_PATH_MODULES" @@ -51,7 +49,7 @@ mkdir -p $INSTALL/etc/X11 cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11 mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/config/x11-input.rules $INSTALL/lib/udev/rules.d #Fonts $SCRIPTS/install encodings diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff index 18b60b4ba6..27503ae51f 100644 --- a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff +++ b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff @@ -1,945 +1,8 @@ -diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure ---- xorg-server-1.7.99.1/configure 2009-10-21 18:07:07.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/configure 2009-10-24 10:51:29.757487523 +0200 -@@ -1,22 +1,20 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.64 for xorg-server 1.7.99.1. -+# Generated by GNU Autoconf 2.63 for xorg-server 1.7.99.1. - # - # Report bugs to . - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software --# Foundation, Inc. --# -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## -------------------- ## --## M4sh Initialization. ## --## -------------------- ## -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -24,15 +22,23 @@ - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in #( -- *posix*) : -- set -o posix ;; #( -- *) : -- ;; -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; - esac -+ - fi - - -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ - as_nl=' - ' - export as_nl -@@ -40,13 +46,7 @@ - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --# Prefer a ksh shell builtin over an external printf program on Solaris, --# but without wasting forks for bash or zsh. --if test -z "$BASH_VERSION$ZSH_VERSION" \ -- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='print -r --' -- as_echo_n='print -rn --' --elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -57,7 +57,7 @@ - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in #( -+ case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -80,6 +80,13 @@ - } - fi - -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -89,15 +96,15 @@ - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in #(( -+case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -- done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done - IFS=$as_save_IFS - - ;; -@@ -109,16 +116,12 @@ - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- exit 1 -+ { (exit 1); exit 1; } - fi - --# Unset variables that we do not need and which cause bugs (e.g. in --# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" --# suppresses any "Segmentation fault" message there. '((' could --# trigger a bug in pdksh 5.2.14. --for as_var in BASH_ENV ENV MAIL MAILPATH --do eval test x\${$as_var+set} = xset \ -- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - PS1='$ ' - PS2='> ' -@@ -130,301 +133,330 @@ - LANGUAGE=C - export LANGUAGE - -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ - # CDPATH. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+$as_unset CDPATH -+ - - if test "x$CONFIG_SHELL" = x; then -- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -- emulate sh -- NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '\${1+\"\$@\"}'='\"\$@\"' -- setopt NO_GLOB_SUBST -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes - else -- case \`(set -o) 2>/dev/null\` in #( -- *posix*) : -- set -o posix ;; #( -- *) : -- ;; --esac -+ as_have_required=no - fi --" -- as_required="as_fn_return () { (exit \$1); } --as_fn_success () { as_fn_return 0; } --as_fn_failure () { as_fn_return 1; } --as_fn_ret_success () { return 0; } --as_fn_ret_failure () { return 1; } -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} - - exitcode=0 --as_fn_success || { exitcode=1; echo as_fn_success failed.; } --as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } --as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } --as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } --if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -- --else -- exitcode=1; echo positional parameters were not saved. --fi --test x\$exitcode = x0 || exit 1" -- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 --test \$(( 1 + 1 )) = 2 || exit 1" -- if (eval "$as_required") 2>/dev/null; then : -- as_have_required=yes -+if as_func_success; then -+ : - else -- as_have_required=no -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. - fi -- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -+if as_func_ret_success; then -+ : - else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --as_found=false -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- as_found=: -- case $as_dir in #( -+ case $as_dir in - /*) - for as_base in sh bash ksh sh5; do -- # Try only shells that exist, to save several forks. -- as_shell=$as_dir/$as_base -- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -- CONFIG_SHELL=$as_shell as_have_required=yes -- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -- break 2 --fi --fi -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -- as_found=false - done --$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -- CONFIG_SHELL=$SHELL as_have_required=yes --fi; } - IFS=$as_save_IFS - - -- if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} --fi -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac - -- if test x$as_have_required = xno; then : -- $as_echo "$0: This script requires a shell more modern than all" -- $as_echo "$0: the shells that I found on your system." -- if test x${ZSH_VERSION+set} = xset ; then -- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -- $as_echo "$0: be upgraded to zsh 4.3.4 or later." -- else -- $as_echo "$0: Please tell bug-autoconf@gnu.org and --$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg --$0: about your system, including any error possibly output --$0: before this message. Then install a modern shell, or --$0: manually run the script under such a shell if you do --$0: have one." -- fi -- exit 1 --fi - fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --SHELL=${CONFIG_SHELL-/bin/sh} --export SHELL --# Unset more variables known to interfere with behavior of common tools. --CLICOLOR_FORCE= GREP_OPTIONS= --unset CLICOLOR_FORCE GREP_OPTIONS - --## --------------------- ## --## M4sh Shell Functions. ## --## --------------------- ## --# as_fn_unset VAR --# --------------- --# Portably unset VAR. --as_fn_unset () --{ -- { eval $1=; unset $1;} --} --as_unset=as_fn_unset -- --# as_fn_set_status STATUS --# ----------------------- --# Set $? to STATUS, without forking. --as_fn_set_status () --{ -- return $1 --} # as_fn_set_status -- --# as_fn_exit STATUS --# ----------------- --# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. --as_fn_exit () --{ -- set +e -- as_fn_set_status $1 -- exit $1 --} # as_fn_exit -- --# as_fn_mkdir_p --# ------------- --# Create "$as_dir" as a directory, including parents if necessary. --as_fn_mkdir_p () --{ - -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || eval $as_mkdir_p || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} - -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi - --} # as_fn_mkdir_p --# as_fn_append VAR VALUE --# ---------------------- --# Append the text in VALUE to the end of the definition contained in VAR. Take --# advantage of any shell optimizations that allow amortized linear growth over --# repeated appends, instead of the typical quadratic growth present in naive --# implementations. --if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -- eval 'as_fn_append () -- { -- eval $1+=\$2 -- }' -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : - else -- as_fn_append () -- { -- eval $1=\$$1\$2 -- } --fi # as_fn_append -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi - --# as_fn_arith ARG... --# ------------------ --# Perform arithmetic evaluation on the ARGs, and store the result in the --# global $as_val. Take advantage of shells that can avoid forks. The arguments --# must be portable across $(()) and expr. --if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -- eval 'as_fn_arith () -- { -- as_val=$(( $* )) -- }' -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : - else -- as_fn_arith () -- { -- as_val=`expr "$@" || test $? -eq 1` -- } --fi # as_fn_arith -+ exitcode=1 -+ echo positional parameters were not saved. -+fi - -+test $exitcode = 0) || { (exit 1); exit 1; } - --# as_fn_error ERROR [LINENO LOG_FD] --# --------------------------------- --# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are --# provided, also output the error to LOG_FD, referencing LINENO. Then exit the --# script with status $?, using 1 if that was 0. --as_fn_error () --{ -- as_status=$?; test $as_status -eq 0 && as_status=1 -- if test "$3"; then -- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -- fi -- $as_echo "$as_me: error: $1" >&2 -- as_fn_exit $as_status --} # as_fn_error -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : - else -- as_expr=false -+ exitcode=1 -+ echo as_func_success failed. - fi - --if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -- as_basename=basename -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : - else -- as_basename=false -+ exitcode=1 -+ echo as_func_ret_success failed. - fi - --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : - else -- as_dirname=false -+ exitcode=1 -+ echo positional parameters were not saved. - fi - --as_me=`$as_basename -- "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell bug-autoconf@gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. -+} - --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits - - -- as_lineno_1=$LINENO as_lineno_1a=$LINENO -- as_lineno_2=$LINENO as_lineno_2a=$LINENO -- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= -@@ -441,7 +473,8 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -@@ -451,18 +484,29 @@ - exit - } - --ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in #((((( ---n*) -- case `echo 'xy\c'` in -- *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- xy) ECHO_C='\c';; -- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -- ECHO_T=' ';; -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; - esac;; - *) - ECHO_N='-n';; - esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi - - rm -f conf$$ conf$$.exe conf$$.file - if test -d conf$$.dir; then -@@ -492,7 +536,7 @@ - rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p='mkdir -p "$as_dir"' -+ as_mkdir_p=: - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -@@ -511,10 +555,10 @@ - if test -d "$1"; then - test -d "$1/."; - else -- case $1 in #( -+ case $1 in - -*)set "./$1";; - esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -@@ -529,6 +573,7 @@ - - - -+ - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - -@@ -695,6 +740,7 @@ - subdirs= - MFLAGS= - MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. - PACKAGE_NAME='xorg-server' -@@ -702,7 +748,6 @@ - PACKAGE_VERSION='1.7.99.1' - PACKAGE_STRING='xorg-server 1.7.99.1' - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' --PACKAGE_URL='' - - ac_unique_file="Makefile.am" - # Factoring default headers for most tests. -@@ -1216,7 +1261,6 @@ - program_transform_name - prefix - exec_prefix --PACKAGE_URL - PACKAGE_BUGREPORT - PACKAGE_STRING - PACKAGE_VERSION -@@ -1506,7 +1550,8 @@ - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid feature name: $ac_useropt" -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1532,7 +1577,8 @@ - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid feature name: $ac_useropt" -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1736,7 +1782,8 @@ - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid package name: $ac_useropt" -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1752,7 +1799,8 @@ - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid package name: $ac_useropt" -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1782,17 +1830,17 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) as_fn_error "unrecognized option: \`$ac_option' --Try \`$0 --help' for more information." -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- case $ac_envvar in #( -- '' | [0-9]* | *[!_$as_cr_alnum]* ) -- as_fn_error "invalid variable name: \`$ac_envvar'" ;; -- esac -+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - -@@ -1809,13 +1857,15 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- as_fn_error "missing argument to $ac_option" -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } - fi - - if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; -+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac - fi -@@ -1838,7 +1888,8 @@ - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -1868,9 +1919,11 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- as_fn_error "working directory cannot be determined" -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- as_fn_error "pwd does not report name of working directory" -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } - - - # Find the source files, if location was not specified. -@@ -1909,11 +1962,13 @@ - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. - if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -2140,7 +2195,7 @@ +diff -Naur xorg-server-20091215/config.log xorg-server-20091215.patch/config.log +diff -Naur xorg-server-20091215/configure xorg-server-20091215.patch/configure +--- xorg-server-20091215/configure 2009-12-15 20:09:57.000000000 +0100 ++++ xorg-server-20091215.patch/configure 2009-12-15 20:16:28.266446508 +0100 +@@ -2220,7 +2220,7 @@ Comma separated list of font dirs --with-xkb-path=PATH Path to XKB base dir (default: ${datadir}/X11/xkb) --with-xkb-output=PATH Path to XKB output dir (default: @@ -948,32563 +11,30 @@ diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure --with-default-xkb-rules=RULES Keyboard ruleset (default: base/evdev) --with-default-xkb-model=MODEL -@@ -2350,1043 +2405,379 @@ - if $ac_init_version; then - cat <<\_ACEOF - xorg-server configure 1.7.99.1 --generated by GNU Autoconf 2.64 -+generated by GNU Autoconf 2.63 - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF - exit - fi -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. - --## ------------------------ ## --## Autoconf initialization. ## --## ------------------------ ## -- --# ac_fn_c_try_compile LINENO --# -------------------------- --# Try to compile conftest.$ac_ext, and return whether this succeeded. --ac_fn_c_try_compile () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- rm -f conftest.$ac_objext -- if { { ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_compile") 2>conftest.err -- ac_status=$? -- if test -s conftest.err; then -- grep -v '^ *+' conftest.err >conftest.er1 -- cat conftest.er1 >&5 -- mv -f conftest.er1 conftest.err -- fi -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then : -- ac_retval=0 --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_retval=1 --fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -- --} # ac_fn_c_try_compile -- --# ac_fn_c_try_link LINENO --# ----------------------- --# Try to link conftest.$ac_ext, and return whether this succeeded. --ac_fn_c_try_link () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- rm -f conftest.$ac_objext conftest$ac_exeext -- if { { ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_link") 2>conftest.err -- ac_status=$? -- if test -s conftest.err; then -- grep -v '^ *+' conftest.err >conftest.er1 -- cat conftest.er1 >&5 -- mv -f conftest.er1 conftest.err -- fi -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then : -- ac_retval=0 --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_retval=1 --fi -- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -- # interfere with the next link command; also delete a directory that is -- # left behind by Apple's compiler. We do this before executing the actions. -- rm -rf conftest.dSYM conftest_ipa8_conftest.oo -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+It was created by xorg-server $as_me 1.7.99.1, which was -+generated by GNU Autoconf 2.63. Invocation command line was - --} # ac_fn_c_try_link -+ $ $0 $@ - --# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES --# ------------------------------------------------------- --# Tests whether HEADER exists and can be compiled using the include files in --# INCLUDES, setting the cache variable VAR accordingly. --ac_fn_c_check_header_compile () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 --$as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --#include <$2> - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval "$3=yes" --else -- eval "$3=no" --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- --} # ac_fn_c_check_header_compile -- --# ac_fn_c_try_cpp LINENO --# ---------------------- --# Try to preprocess conftest.$ac_ext, and return whether this succeeded. --ac_fn_c_try_cpp () -+exec 5>>config.log - { -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- if { { ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -- ac_status=$? -- if test -s conftest.err; then -- grep -v '^ *+' conftest.err >conftest.er1 -- cat conftest.er1 >&5 -- mv -f conftest.er1 conftest.err -- fi -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then : -- ac_retval=0 --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_retval=1 --fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## - --} # ac_fn_c_try_cpp -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` - --# ac_fn_c_try_run LINENO --# ---------------------- --# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes --# that executables *can* be run. --ac_fn_c_try_run () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- if { { ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -- { { case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; }; then : -- ac_retval=0 --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -- ac_retval=$ac_status --fi -- rm -rf conftest.dSYM conftest_ipa8_conftest.oo -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - --} # ac_fn_c_try_run -+_ASUNAME - --# ac_fn_c_check_func LINENO FUNC VAR --# ---------------------------------- --# Tests whether FUNC exists, setting the cache variable VAR accordingly --ac_fn_c_check_func () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 --$as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --/* Define $2 to an innocuous variant, in case declares $2. -- For example, HP-UX 11i declares gettimeofday. */ --#define $2 innocuous_$2 -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+done -+IFS=$as_save_IFS - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $2 (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+} >&5 - --#ifdef __STDC__ --# include --#else --# include --#endif -+cat >&5 <<_ACEOF - --#undef $2 - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $2 (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$2 || defined __stub___$2 --choke me --#endif -+## ----------- ## -+## Core tests. ## -+## ----------- ## - --int --main () --{ --return $2 (); -- ; -- return 0; --} - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- eval "$3=yes" --else -- eval "$3=no" --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- --} # ac_fn_c_check_func -- --# ac_fn_c_check_decl LINENO SYMBOL VAR --# ------------------------------------ --# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. --ac_fn_c_check_decl () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 --$as_echo_n "checking whether $2 is declared... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --#ifndef $2 -- (void) $2; --#endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval "$3=yes" --else -- eval "$3=no" --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - --} # ac_fn_c_check_decl -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ ;; -+ esac -+ done -+done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - --# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES --# ------------------------------------------------------- --# Tests whether HEADER exists, giving a warning if it cannot be compiled using --# the include files in INCLUDES and setting the cache variable VAR --# accordingly. --ac_fn_c_check_header_mongrel () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 --$as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 --$as_echo_n "checking $2 usability... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --#include <$2> --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_header_compiler=yes --else -- ac_header_compiler=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo - --# Is the header present? --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 --$as_echo_n "checking $2 presence... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <$2> --_ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -- ac_header_preproc=yes --else -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -- yes:no: ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -- ;; -- no:yes:* ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} --( cat <<\_ASBOX --## ---------------------------------------------------------------------- ## --## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## --## ---------------------------------------------------------------------- ## -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## - _ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 --$as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- eval "$3=\$ac_header_compiler" --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo - --} # ac_fn_c_check_header_mongrel -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi - --# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES --# -------------------------------------------- --# Tries to find the compile-time value of EXPR in a program that includes --# INCLUDES, setting VAR accordingly. Returns whether the value could be --# computed --ac_fn_c_compute_int () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- if test "$cross_compiling" = yes; then -- # Depending upon the size, compute the lo and hi bounds. --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --static int test_array [1 - 2 * !(($2) >= 0)]; --test_array [0] = 0 -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+## ----------- ## -+## confdefs.h. ## -+## ----------- ## -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+done -+ac_signal=0 - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_lo=0 ac_mid=0 -- while :; do -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_hi=$ac_mid; break --else -- as_fn_arith $ac_mid + 1 && ac_lo=$as_val -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --static int test_array [1 - 2 * !(($2) < 0)]; --test_array [0] = 0 -+# Predefined preprocessor variables. - -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_hi=-1 ac_mid=-1 -- while :; do -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --static int test_array [1 - 2 * !(($2) >= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_lo=$ac_mid; break --else -- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- ac_lo= ac_hi= --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --# Binary search between lo and hi bounds. --while test "x$ac_lo" != "x$ac_hi"; do -- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_hi=$ac_mid --else -- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --done --case $ac_lo in #(( --?*) eval "$3=\$ac_lo"; ac_retval=0 ;; --'') ac_retval=1 ;; --esac -- else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --static long int longval () { return $2; } --static unsigned long int ulongval () { return $2; } --#include --#include --int --main () --{ - -- FILE *f = fopen ("conftest.val", "w"); -- if (! f) -- return 1; -- if (($2) < 0) -- { -- long int i = longval (); -- if (i != ($2)) -- return 1; -- fprintf (f, "%ld", i); -- } -- else -- { -- unsigned long int i = ulongval (); -- if (i != ($2)) -- return 1; -- fprintf (f, "%lu", i); -- } -- /* Do not output a trailing newline, as this causes \r\n confusion -- on some platforms. */ -- return ferror (f) || fclose (f) != 0; - -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- echo >>conftest.val; read $3 &5 --$as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- eval "$3=no" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --if (sizeof ($2)) -- return 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$4 --int --main () --{ --if (sizeof (($2))) -- return 0; -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : - --else -- eval "$3=yes" --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --eval ac_res=\$$3 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - --} # ac_fn_c_check_type -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF - --# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES --# ---------------------------------------------------- --# Tries to find if the field MEMBER exists in type AGGR, after including --# INCLUDES, setting cache variable VAR accordingly. --ac_fn_c_check_member () --{ -- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 --$as_echo_n "checking for $2.$3... " >&6; } --if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$5 --int --main () --{ --static $2 ac_aggr; --if (ac_aggr.$3) --return 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval "$4=yes" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$5 --int --main () --{ --static $2 ac_aggr; --if (sizeof ac_aggr.$3) --return 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval "$4=yes" -+ -+# Let the site file select an alternate cache file if it wants to. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ ac_site_file1=$CONFIG_SITE -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site - else -- eval "$4=no" -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test -r "$ac_site_file"; then -+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; -+ esac -+ fi -+else -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { (exit 1); exit 1; }; } - fi --eval ac_res=\$$4 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - --} # ac_fn_c_check_member --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.1, which was --generated by GNU Autoconf 2.64. Invocation command line was - -- $ $0 $@ - --_ACEOF --exec 5>>config.log --{ --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## - --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` - --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - --_ASUNAME - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- $as_echo "PATH: $as_dir" -- done --IFS=$as_save_IFS - --} >&5 - --cat >&5 <<_ACEOF - - --## ----------- ## --## Core tests. ## --## ----------- ## - --_ACEOF - - --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. --# Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. --ac_configure_args= --ac_configure_args0= --ac_configure_args1= --ac_must_keep_next=false --for ac_pass in 1 2 --do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *\'*) -- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; -- 2) -- as_fn_append ac_configure_args1 " '$ac_arg'" -- if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -- else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -- fi -- as_fn_append ac_configure_args " '$ac_arg'" -- ;; -- esac -- done --done --{ ac_configure_args0=; unset ac_configure_args0;} --{ ac_configure_args1=; unset ac_configure_args1;} - --# When interrupted or exit'd, cleanup temporary files, and complete --# config.log. We remove comments because anyway the quotes in there --# would cause problems or look ugly. --# WARNING: Use '\'' to represent an apostrophe within the trap. --# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. --trap 'exit_status=$? -- # Save into config.log some information that might help in debugging. -- { -- echo - -- cat <<\_ASBOX --## ---------------- ## --## Cache variables. ## --## ---------------- ## --_ASBOX -- echo -- # The following way of writing the cache mishandles newlines in values, --( -- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -- eval ac_val=\$$ac_var -- case $ac_val in #( -- *${as_nl}*) -- case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 --$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -- esac -- case $ac_var in #( -- _ | IFS | as_nl) ;; #( -- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) { eval $ac_var=; unset $ac_var;} ;; -- esac ;; -- esac -- done -- (set) 2>&1 | -- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -- *${as_nl}ac_space=\ *) -- sed -n \ -- "s/'\''/'\''\\\\'\'''\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -- ;; #( -- *) -- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -- ;; -- esac | -- sort --) -- echo - -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=\$$ac_var -- case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -- esac -- $as_echo "$ac_var='\''$ac_val'\''" -- done | sort -- echo - -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------------- ## --## File substitutions. ## --## ------------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=\$$ac_var -- case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -- esac -- $as_echo "$ac_var='\''$ac_val'\''" -- done | sort -- echo -- fi -- -- if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## --## confdefs.h. ## --## ----------- ## --_ASBOX -- echo -- cat confdefs.h -- echo -- fi -- test "$ac_signal" != 0 && -- $as_echo "$as_me: caught signal $ac_signal" -- $as_echo "$as_me: exit $exit_status" -- } >&5 -- rm -f core *.core core.conftest.* && -- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -- exit $exit_status --' 0 --for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal --done --ac_signal=0 -- --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -f -r conftest* confdefs.h - --$as_echo "/* confdefs.h */" > confdefs.h - --# Predefined preprocessor variables. -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" --_ACEOF -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" --_ACEOF -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" --_ACEOF -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" --_ACEOF -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" --_ACEOF -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_URL "$PACKAGE_URL" --_ACEOF -- -- --# Let the site file select an alternate cache file if it wants to. --# Prefer an explicitly selected file to automatically selected ones. --ac_site_file1=NONE --ac_site_file2=NONE --if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE --elif test "x$prefix" != xNONE; then -- ac_site_file1=$prefix/share/config.site -- ac_site_file2=$prefix/etc/config.site --else -- ac_site_file1=$ac_default_prefix/share/config.site -- ac_site_file2=$ac_default_prefix/etc/config.site --fi --for ac_site_file in "$ac_site_file1" "$ac_site_file2" --do -- test "x$ac_site_file" = xNONE && continue -- if test -r "$ac_site_file"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 --$as_echo "$as_me: loading site script $ac_site_file" >&6;} -- sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -- fi --done - --if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 --$as_echo "$as_me: loading cache $cache_file" >&6;} -- case $cache_file in -- [\\/]* | ?:[\\/]* ) . "$cache_file";; -- *) . "./$cache_file";; -- esac -- fi --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 --$as_echo "$as_me: creating cache $cache_file" >&6;} -- >$cache_file --fi - --# Check that the precious variables saved in the cache have kept the same --# value. --ac_cache_corrupted=false --for ac_var in $ac_precious_vars; do -- eval ac_old_set=\$ac_cv_env_${ac_var}_set -- eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val=\$ac_cv_env_${ac_var}_value -- eval ac_new_val=\$ac_env_${ac_var}_value -- case $ac_old_set,$ac_new_set in -- set,) -- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,set) -- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -- ac_cache_corrupted=: ;; -- ,);; -- *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -- # differences in whitespace do not lead to failure. -- ac_old_val_w=`echo x $ac_old_val` -- ac_new_val_w=`echo x $ac_new_val` -- if test "$ac_old_val_w" != "$ac_new_val_w"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 --$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- ac_cache_corrupted=: -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 --$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -- eval $ac_var=\$ac_old_val -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 --$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 --$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -- fi;; -- esac -- # Pass precious variables to config.status. -- if test "$ac_new_set" = set; then -- case $ac_new_val in -- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -- *) ac_arg=$ac_var=$ac_new_val ;; -- esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) as_fn_append ac_configure_args " '$ac_arg'" ;; -- esac -- fi --done --if $ac_cache_corrupted; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 --$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 --fi --## -------------------- ## --## Main body of script. ## --## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -3401,16 +2792,24 @@ - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -- for ac_t in install-sh install.sh shtool; do -- if test -f "$ac_dir/$ac_t"; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/$ac_t -c" -- break 2 -- fi -- done -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi - done - if test -z "$ac_aux_dir"; then -- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { (exit 1); exit 1; }; } - fi - - # These three variables are undocumented and unsupported, -@@ -3436,10 +2835,10 @@ - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - # Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 - $as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then : -+if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -3447,11 +2846,11 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in #(( -- ./ | .// | /[cC]/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -3488,7 +2887,7 @@ - ;; - esac - -- done -+done - IFS=$as_save_IFS - - rm -rf conftest.one conftest.two conftest.dir -@@ -3504,7 +2903,7 @@ - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 - $as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -3515,7 +2914,7 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 - $as_echo_n "checking whether build environment is sane... " >&6; } - # Just in case - sleep 1 -@@ -3526,11 +2925,15 @@ - ' - case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) -- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; -+ { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} -+ { (exit 1); exit 1; }; };; - esac - case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) -- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -+ { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} -+ { (exit 1); exit 1; }; };; - esac - - # Do `set' in a subshell so we don't clobber the current shell's -@@ -3552,8 +2955,11 @@ - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- as_fn_error "ls -t appears to fail. Make sure there is not a broken --alias in your environment" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&5 -+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&2;} -+ { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file -@@ -3562,10 +2968,13 @@ - # Ok. - : - else -- as_fn_error "newly created file is older than distributed files! --Check your system clock" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+Check your system clock" >&5 -+$as_echo "$as_me: error: newly created file is older than distributed files! -+Check your system clock" >&2;} -+ { (exit 1); exit 1; }; } - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -3593,7 +3002,7 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 - $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - -@@ -3614,9 +3023,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then : -+if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -3627,24 +3036,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 - $as_echo "$STRIP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3654,9 +3063,9 @@ - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then -@@ -3667,24 +3076,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 - $as_echo "$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3693,7 +3102,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -3706,10 +3115,10 @@ - fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 - $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } - if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then : -+ if test "${ac_cv_path_mkdir+set}" = set; then - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -3717,7 +3126,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do -+ for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -3729,7 +3138,7 @@ - esac - done - done -- done -+done - IFS=$as_save_IFS - - fi -@@ -3745,7 +3154,7 @@ - MKDIR_P="$ac_install_sh -d" - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 - $as_echo "$MKDIR_P" >&6; } - - mkdir_p="$MKDIR_P" -@@ -3758,9 +3167,9 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AWK+set}" = set; then : -+if test "${ac_cv_prog_AWK+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then -@@ -3771,24 +3180,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 - $as_echo "$AWK" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3796,11 +3205,11 @@ - test -n "$AWK" && break - done - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 - $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } - set x ${MAKE-make} - ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -@@ -3818,11 +3227,11 @@ - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - SET_MAKE= - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi -@@ -3842,7 +3251,9 @@ - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then -- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { (exit 1); exit 1; }; } - fi - fi - -@@ -3899,16 +3310,16 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 - $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then : -+if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval - else - USE_MAINTAINER_MODE=no - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -+ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 - $as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= -@@ -3960,9 +3371,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3973,24 +3384,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4000,9 +3411,9 @@ - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -4013,24 +3424,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 - $as_echo "$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4039,7 +3450,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -4053,9 +3464,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -4066,24 +3477,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4093,9 +3504,9 @@ - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -4107,18 +3518,18 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then -@@ -4137,10 +3548,10 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4152,9 +3563,9 @@ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -4165,24 +3576,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4196,9 +3607,9 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -4209,24 +3620,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 - $as_echo "$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -4239,7 +3650,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -4250,55 +3661,73 @@ - fi - - --test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "no acceptable C compiler found in \$PATH --See \`config.log' for more details." "$LINENO" 5; } -+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - - # Provide some information about the compiler. --$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 - set X $ac_compile - ac_compiler=$2 --for ac_option in --version -v -V -qversion; do -- { { ac_try="$ac_compiler $ac_option >&5" -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_compiler $ac_option >&5") 2>conftest.err -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- if test -s conftest.err; then -- sed '10a\ --... rest of stderr output deleted ... -- 10q' conftest.err >conftest.er1 -- cat conftest.er1 >&5 -- rm -f conftest.er1 conftest.err -- fi -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } --done -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } - --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+ - int - main () - { --FILE *f = fopen ("conftest.out", "w"); -- return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 - $as_echo_n "checking for C compiler default output file name... " >&6; } - ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -@@ -4315,17 +3744,17 @@ - done - rm -f $ac_rmfiles - --if { { ac_try="$ac_link_default" -+if { (ac_try="$ac_link_default" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then : -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' - # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -4342,7 +3771,7 @@ - # certainly right. - break;; - *.* ) -- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi -@@ -4361,75 +3790,84 @@ - else - ac_file='' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+ -+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 - $as_echo "$ac_file" >&6; } --if test -z "$ac_file"; then : -+if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "C compiler cannot create executables --See \`config.log' for more details." "$LINENO" 5; }; } -+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: C compiler cannot create executables -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } - fi -+ - ac_exeext=$ac_cv_exeext - - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 - $as_echo_n "checking whether the C compiler works... " >&6; } -+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { { case "(($ac_try" in -+ { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run C compiled programs. -+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - fi - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 - $as_echo "$cross_compiling" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } --if { { ac_try="$ac_link" -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then : -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -4444,24 +3882,32 @@ - esac - done - else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." "$LINENO" 5; } -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - fi -+ - rm -f conftest$ac_cv_exeext --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 - $as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } --if test "${ac_cv_objext+set}" = set; then : -+if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -4473,17 +3919,17 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { { ac_try="$ac_compile" -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then : -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -@@ -4496,23 +3942,31 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot compute suffix of object files: cannot compile --See \`config.log' for more details." "$LINENO" 5; } -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - fi -+ - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 - $as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 - $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } --if test "${ac_cv_c_compiler_gnu+set}" = set; then : -+if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -4526,16 +3980,37 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- ac_compiler_gnu=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 - $as_echo "$ac_cv_c_compiler_gnu" >&6; } - if test $ac_compiler_gnu = yes; then - GCC=yes -@@ -4544,16 +4019,20 @@ - fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 - $as_echo_n "checking whether $CC accepts -g... " >&6; } --if test "${ac_cv_prog_cc_g+set}" = set; then : -+if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -4564,11 +4043,35 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else -- CFLAGS="" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -4579,12 +4082,36 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : - else -- ac_c_werror_flag=$ac_save_c_werror_flag -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -4595,17 +4122,42 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 - $as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -@@ -4622,14 +4174,18 @@ - CFLAGS= - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 - $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } --if test "${ac_cv_prog_cc_c89+set}" = set; then : -+if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - #include -@@ -4686,9 +4242,32 @@ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_prog_cc_c89=$ac_arg -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi -+ - rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break - done -@@ -4699,19 +4278,17 @@ - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 - $as_echo "none needed" >&6; } ;; - xno) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 - $as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 - $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac --if test "x$ac_cv_prog_cc_c89" != xno; then : - --fi - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -4730,7 +4307,7 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 - $as_echo_n "checking for style of include used by $am_make... " >&6; } - am__include="#" - am__quote= -@@ -4758,12 +4335,12 @@ - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 - $as_echo "$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then : -+if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; - fi - -@@ -4783,9 +4360,9 @@ - - depcc="$CC" am_compiler_list= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4893,7 +4470,7 @@ - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -@@ -4917,9 +4494,9 @@ - - depcc="$CCAS" am_compiler_list= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : -+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -5025,7 +4602,7 @@ - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } - CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type - -@@ -5040,41 +4617,141 @@ - fi - - -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+ -+done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 - $as_echo_n "checking whether ln -s works... " >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 - $as_echo "no, using $LN_S" >&6; } - fi - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { (exit 1); exit 1; }; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+{ $as_echo "$as_me:$LINENO: checking build system type" >&5 - $as_echo_n "checking build system type... " >&6; } --if test "${ac_cv_build+set}" = set; then : -+if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { (exit 1); exit 1; }; } - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { (exit 1); exit 1; }; } - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 - $as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+$as_echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; - esac - build=$ac_cv_build - ac_save_IFS=$IFS; IFS='-' -@@ -5090,24 +4767,28 @@ - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+{ $as_echo "$as_me:$LINENO: checking host system type" >&5 - $as_echo_n "checking host system type... " >&6; } --if test "${ac_cv_host+set}" = set; then : -+if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { (exit 1); exit 1; }; } - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 - $as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; -+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+$as_echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; - esac - host=$ac_cv_host - ac_save_IFS=$IFS; IFS='-' -@@ -5130,9 +4811,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. - set dummy ${ac_tool_prefix}as; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AS+set}" = set; then : -+if test "${ac_cv_prog_AS+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$AS"; then -@@ -5143,24 +4824,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - AS=$ac_cv_prog_AS - if test -n "$AS"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -+ { $as_echo "$as_me:$LINENO: result: $AS" >&5 - $as_echo "$AS" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5170,9 +4851,9 @@ - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. - set dummy as; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_AS"; then -@@ -5183,24 +4864,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_AS=$ac_cv_prog_ac_ct_AS - if test -n "$ac_ct_AS"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 - $as_echo "$ac_ct_AS" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5209,7 +4890,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -5222,9 +4903,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. - set dummy ${ac_tool_prefix}dlltool; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$DLLTOOL"; then -@@ -5235,24 +4916,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - DLLTOOL=$ac_cv_prog_DLLTOOL - if test -n "$DLLTOOL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 - $as_echo "$DLLTOOL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5262,9 +4943,9 @@ - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. - set dummy dlltool; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_DLLTOOL"; then -@@ -5275,24 +4956,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL - if test -n "$ac_ct_DLLTOOL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 - $as_echo "$ac_ct_DLLTOOL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5301,7 +4982,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -5314,9 +4995,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then : -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$OBJDUMP"; then -@@ -5327,24 +5008,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - OBJDUMP=$ac_cv_prog_OBJDUMP - if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 - $as_echo "$OBJDUMP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5354,9 +5035,9 @@ - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OBJDUMP"; then -@@ -5367,24 +5048,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP - if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 - $as_echo "$ac_ct_OBJDUMP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5393,7 +5074,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -5427,7 +5108,7 @@ - - - # Check whether --enable-static was given. --if test "${enable_static+set}" = set; then : -+if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; -@@ -5459,7 +5140,7 @@ - - case `pwd` in - *\ * | *\ *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 - $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; - esac - -@@ -5482,9 +5163,9 @@ - - ltmain="$ac_aux_dir/ltmain.sh" - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 - $as_echo_n "checking for a sed that does not truncate output... " >&6; } --if test "${ac_cv_path_SED+set}" = set; then : -+if test "${ac_cv_path_SED+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -5492,7 +5173,7 @@ - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -- { ac_script=; unset ac_script;} -+ $as_unset ac_script || ac_script= - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST -@@ -5501,7 +5182,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in sed gsed; do -+ for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -5521,7 +5202,7 @@ - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- as_fn_arith $ac_count + 1 && ac_count=$as_val -+ ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" -@@ -5536,17 +5217,19 @@ - $ac_path_SED_found && break 3 - done - done -- done -+done - IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then -- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } - fi - else - ac_cv_path_SED=$SED - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 - $as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed -@@ -5564,9 +5247,9 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 - $as_echo_n "checking for grep that handles long lines and -e... " >&6; } --if test "${ac_cv_path_GREP+set}" = set; then : -+if test "${ac_cv_path_GREP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -z "$GREP"; then -@@ -5577,7 +5260,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in grep ggrep; do -+ for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -5597,7 +5280,7 @@ - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- as_fn_arith $ac_count + 1 && ac_count=$as_val -+ ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" -@@ -5612,24 +5295,26 @@ - $ac_path_GREP_found && break 3 - done - done -- done -+done - IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then -- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } - fi - else - ac_cv_path_GREP=$GREP - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 - $as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 - $as_echo_n "checking for egrep... " >&6; } --if test "${ac_cv_path_EGREP+set}" = set; then : -+if test "${ac_cv_path_EGREP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5643,7 +5328,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in egrep; do -+ for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -5663,7 +5348,7 @@ - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- as_fn_arith $ac_count + 1 && ac_count=$as_val -+ ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" -@@ -5678,10 +5363,12 @@ - $ac_path_EGREP_found && break 3 - done - done -- done -+done - IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then -- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } - fi - else - ac_cv_path_EGREP=$EGREP -@@ -5689,14 +5376,14 @@ - - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 - $as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 - $as_echo_n "checking for fgrep... " >&6; } --if test "${ac_cv_path_FGREP+set}" = set; then : -+if test "${ac_cv_path_FGREP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -5710,7 +5397,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in fgrep; do -+ for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -5730,7 +5417,7 @@ - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- as_fn_arith $ac_count + 1 && ac_count=$as_val -+ ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" -@@ -5745,10 +5432,12 @@ - $ac_path_FGREP_found && break 3 - done - done -- done -+done - IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then -- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } - fi - else - ac_cv_path_FGREP=$FGREP -@@ -5756,7 +5445,7 @@ - - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 - $as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - -@@ -5782,7 +5471,7 @@ - - - # Check whether --with-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then : -+if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no -@@ -5791,7 +5480,7 @@ - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 - $as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) -@@ -5821,13 +5510,13 @@ - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 - $as_echo_n "checking for GNU ld... " >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 - $as_echo_n "checking for non-GNU ld... " >&6; } - fi --if test "${lt_cv_path_LD+set}" = set; then : -+if test "${lt_cv_path_LD+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then -@@ -5858,16 +5547,18 @@ - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -+ { $as_echo "$as_me:$LINENO: result: $LD" >&5 - $as_echo "$LD" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi --test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 - $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } --if test "${lt_cv_prog_gnu_ld+set}" = set; then : -+if test "${lt_cv_prog_gnu_ld+set}" = set; then - $as_echo_n "(cached) " >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -5880,7 +5571,7 @@ - ;; - esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 - $as_echo "$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - -@@ -5892,9 +5583,9 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 - $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } --if test "${lt_cv_path_NM+set}" = set; then : -+if test "${lt_cv_path_NM+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$NM"; then -@@ -5941,7 +5632,7 @@ - : ${lt_cv_path_NM=no} - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 - $as_echo "$lt_cv_path_NM" >&6; } - if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -@@ -5952,9 +5643,9 @@ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DUMPBIN+set}" = set; then : -+if test "${ac_cv_prog_DUMPBIN+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$DUMPBIN"; then -@@ -5965,24 +5656,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - DUMPBIN=$ac_cv_prog_DUMPBIN - if test -n "$DUMPBIN"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -+ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 - $as_echo "$DUMPBIN" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5996,9 +5687,9 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_DUMPBIN"; then -@@ -6009,24 +5700,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN - if test -n "$ac_ct_DUMPBIN"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 - $as_echo "$ac_ct_DUMPBIN" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6039,7 +5730,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6059,33 +5750,33 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 - $as_echo_n "checking the name lister ($NM) interface... " >&6; } --if test "${lt_cv_nm_interface+set}" = set; then : -+if test "${lt_cv_nm_interface+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6069: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:5760: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6072: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:5763: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6075: output\"" >&5) -+ (eval echo "\"\$as_me:5766: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 - $as_echo "$lt_cv_nm_interface" >&6; } - - # find the maximum length of command line arguments --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 - $as_echo_n "checking the maximum length of command line arguments... " >&6; } --if test "${lt_cv_sys_max_cmd_len+set}" = set; then : -+if test "${lt_cv_sys_max_cmd_len+set}" = set; then - $as_echo_n "(cached) " >&6 - else - i=0 -@@ -6203,10 +5894,10 @@ - fi - - if test -n $lt_cv_sys_max_cmd_len ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 - $as_echo "$lt_cv_sys_max_cmd_len" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -+ { $as_echo "$as_me:$LINENO: result: none" >&5 - $as_echo "none" >&6; } - fi - max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6220,7 +5911,7 @@ - : ${MV="mv -f"} - : ${RM="rm -f"} - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 - $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } - # Try some XSI features - xsi_shell=no -@@ -6230,17 +5921,17 @@ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 - $as_echo "$xsi_shell" >&6; } - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 - $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } - lt_shell_append=no - ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 - $as_echo "$lt_shell_append" >&6; } - - -@@ -6275,14 +5966,14 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } --if test "${lt_cv_ld_reload_flag+set}" = set; then : -+if test "${lt_cv_ld_reload_flag+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_ld_reload_flag='-r' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 - $as_echo "$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag - case $reload_flag in -@@ -6311,9 +6002,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then : -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$OBJDUMP"; then -@@ -6324,24 +6015,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - OBJDUMP=$ac_cv_prog_OBJDUMP - if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 - $as_echo "$OBJDUMP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6351,9 +6042,9 @@ - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OBJDUMP"; then -@@ -6364,24 +6055,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP - if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 - $as_echo "$ac_ct_OBJDUMP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6390,7 +6081,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6407,9 +6098,9 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 - $as_echo_n "checking how to recognize dependent libraries... " >&6; } --if test "${lt_cv_deplibs_check_method+set}" = set; then : -+if test "${lt_cv_deplibs_check_method+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -6603,7 +6294,7 @@ - esac - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method -@@ -6623,9 +6314,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AR+set}" = set; then : -+if test "${ac_cv_prog_AR+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$AR"; then -@@ -6636,24 +6327,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+ { $as_echo "$as_me:$LINENO: result: $AR" >&5 - $as_echo "$AR" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6663,9 +6354,9 @@ - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_AR"; then -@@ -6676,24 +6367,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 - $as_echo "$ac_ct_AR" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6702,7 +6393,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6728,9 +6419,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then : -+if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -6741,24 +6432,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 - $as_echo "$STRIP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6768,9 +6459,9 @@ - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then -@@ -6781,24 +6472,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 - $as_echo "$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6807,7 +6498,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6827,9 +6518,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_RANLIB+set}" = set; then : -+if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then -@@ -6840,24 +6531,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 - $as_echo "$RANLIB" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6867,9 +6558,9 @@ - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then -@@ -6880,24 +6571,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 - $as_echo "$ac_ct_RANLIB" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6906,7 +6597,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6984,9 +6675,9 @@ - - - # Check for command to grab the raw symbol name followed by C symbol from nm. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 - $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - $as_echo_n "(cached) " >&6 - else - -@@ -7102,18 +6793,18 @@ - int main(){nm_test_var='a';nm_test_func();return(0);} - _LT_EOF - -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s "$nlist"; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -7166,11 +6857,11 @@ - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext}; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" -@@ -7204,10 +6895,10 @@ - lt_cv_sys_global_symbol_to_cdecl= - fi - if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -+ { $as_echo "$as_me:$LINENO: result: failed" >&5 - $as_echo "failed" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -+ { $as_echo "$as_me:$LINENO: result: ok" >&5 - $as_echo "ok" >&6; } - fi - -@@ -7234,7 +6925,7 @@ - - - # Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then : -+if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; - fi - -@@ -7246,11 +6937,11 @@ - ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" -@@ -7264,12 +6955,12 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 7267 "configure"' > conftest.$ac_ext -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ echo '#line 6958 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) -@@ -7303,11 +6994,11 @@ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -@@ -7356,9 +7047,9 @@ - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -+ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 - $as_echo_n "checking whether the C compiler needs -belf... " >&6; } --if test "${lt_cv_cc_needs_belf+set}" = set; then : -+if test "${lt_cv_cc_needs_belf+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_ext=c -@@ -7367,7 +7058,11 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -7378,13 +7073,38 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - lt_cv_cc_needs_belf=yes - else -- lt_cv_cc_needs_belf=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_cc_needs_belf=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7392,7 +7112,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 - $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7402,11 +7122,11 @@ - sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -@@ -7432,9 +7152,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. - set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$DSYMUTIL"; then -@@ -7445,24 +7165,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - DSYMUTIL=$ac_cv_prog_DSYMUTIL - if test -n "$DSYMUTIL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 - $as_echo "$DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7472,9 +7192,9 @@ - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. - set dummy dsymutil; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_DSYMUTIL"; then -@@ -7485,24 +7205,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL - if test -n "$ac_ct_DSYMUTIL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 - $as_echo "$ac_ct_DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7511,7 +7231,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7524,9 +7244,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. - set dummy ${ac_tool_prefix}nmedit; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_NMEDIT+set}" = set; then : -+if test "${ac_cv_prog_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$NMEDIT"; then -@@ -7537,24 +7257,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - NMEDIT=$ac_cv_prog_NMEDIT - if test -n "$NMEDIT"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 - $as_echo "$NMEDIT" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7564,9 +7284,9 @@ - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. - set dummy nmedit; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_NMEDIT"; then -@@ -7577,24 +7297,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT - if test -n "$ac_ct_NMEDIT"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 - $as_echo "$ac_ct_NMEDIT" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7603,7 +7323,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7616,9 +7336,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. - set dummy ${ac_tool_prefix}lipo; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LIPO+set}" = set; then : -+if test "${ac_cv_prog_LIPO+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$LIPO"; then -@@ -7629,24 +7349,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - LIPO=$ac_cv_prog_LIPO - if test -n "$LIPO"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -+ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 - $as_echo "$LIPO" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7656,9 +7376,9 @@ - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. - set dummy lipo; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_LIPO"; then -@@ -7669,24 +7389,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO - if test -n "$ac_ct_LIPO"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 - $as_echo "$ac_ct_LIPO" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7695,7 +7415,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7708,9 +7428,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. - set dummy ${ac_tool_prefix}otool; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL+set}" = set; then : -+if test "${ac_cv_prog_OTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$OTOOL"; then -@@ -7721,24 +7441,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - OTOOL=$ac_cv_prog_OTOOL - if test -n "$OTOOL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 - $as_echo "$OTOOL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7748,9 +7468,9 @@ - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. - set dummy otool; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OTOOL"; then -@@ -7761,24 +7481,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL - if test -n "$ac_ct_OTOOL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 - $as_echo "$ac_ct_OTOOL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7787,7 +7507,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7800,9 +7520,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. - set dummy ${ac_tool_prefix}otool64; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL64+set}" = set; then : -+if test "${ac_cv_prog_OTOOL64+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$OTOOL64"; then -@@ -7813,24 +7533,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - OTOOL64=$ac_cv_prog_OTOOL64 - if test -n "$OTOOL64"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -+ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 - $as_echo "$OTOOL64" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7840,9 +7560,9 @@ - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. - set dummy otool64; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OTOOL64"; then -@@ -7853,24 +7573,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 - if test -n "$ac_ct_OTOOL64"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 - $as_echo "$ac_ct_OTOOL64" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7879,7 +7599,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7915,9 +7635,9 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -+ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 - $as_echo_n "checking for -single_module linker flag... " >&6; } --if test "${lt_cv_apple_cc_single_mod+set}" = set; then : -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_apple_cc_single_mod=no -@@ -7942,18 +7662,22 @@ - rm -f conftest.* - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 - $as_echo "$lt_cv_apple_cc_single_mod" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -+ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 - $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } --if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -7964,17 +7688,42 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - lt_cv_ld_exported_symbols_list=yes - else -- lt_cv_ld_exported_symbols_list=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_ld_exported_symbols_list=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 - $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) -@@ -8016,14 +7765,14 @@ - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 - $as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then : -+ if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded -@@ -8038,7 +7787,11 @@ - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -8047,34 +7800,78 @@ - #endif - Syntax error - _ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -- -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - _ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then : -+if $ac_preproc_ok; then - break - fi - -@@ -8086,7 +7883,7 @@ - else - ac_cv_prog_CPP=$CPP - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 - $as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -8097,7 +7894,11 @@ - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -8106,40 +7907,87 @@ - #endif - Syntax error - _ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -- --else -- # Broken: fails on valid input. --continue --fi --rm -f conftest.err conftest.$ac_ext -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+ -+rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - _ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then : -- -+if $ac_preproc_ok; then -+ : - else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." "$LINENO" 5; } -+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - fi - - ac_ext=c -@@ -8149,12 +7997,16 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then : -+if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - #include -@@ -8169,23 +8021,48 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes - else -- ac_cv_header_stdc=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_header_stdc=no - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then : -- -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : - else - ac_cv_header_stdc=no - fi -@@ -8195,14 +8072,18 @@ - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then : -- -+ $EGREP "free" >/dev/null 2>&1; then -+ : - else - ac_cv_header_stdc=no - fi -@@ -8212,10 +8093,14 @@ - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes; then - : - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include - #include -@@ -8242,34 +8127,118 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : - else -- ac_cv_header_stdc=no -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_header_stdc=no - fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - -+ - fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 - $as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --$as_echo "#define STDC_HEADERS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -+ -+ -+ -+ -+ -+ -+ -+ -+ - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default --" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_Header=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -8279,13 +8248,62 @@ - done - - -+ - for ac_header in dlfcn.h --do : -- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default --" --if test "x$ac_cv_header_dlfcn_h" = x""yes; then : -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_Header=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_DLFCN_H 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -8303,7 +8321,7 @@ - - - # Check whether --enable-shared was given. --if test "${enable_shared+set}" = set; then : -+if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; -@@ -8336,7 +8354,7 @@ - - - # Check whether --with-pic was given. --if test "${with_pic+set}" = set; then : -+if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" - else - pic_mode=default -@@ -8352,7 +8370,7 @@ - - - # Check whether --enable-fast-install was given. --if test "${enable_fast_install+set}" = set; then : -+if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; -@@ -8433,9 +8451,9 @@ - setopt NO_GLOB_SUBST - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 - $as_echo_n "checking for objdir... " >&6; } --if test "${lt_cv_objdir+set}" = set; then : -+if test "${lt_cv_objdir+set}" = set; then - $as_echo_n "(cached) " >&6 - else - rm -f .libs 2>/dev/null -@@ -8448,7 +8466,7 @@ - fi - rmdir .libs 2>/dev/null - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 - $as_echo "$lt_cv_objdir" >&6; } - objdir=$lt_cv_objdir - -@@ -8541,9 +8559,9 @@ - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -+ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 - $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in -@@ -8594,10 +8612,10 @@ - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -8607,9 +8625,9 @@ - - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -+ { $as_echo "$as_me:$LINENO: checking for file" >&5 - $as_echo_n "checking for file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in -@@ -8660,10 +8678,10 @@ - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -8744,9 +8762,9 @@ - if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } --if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no -@@ -8762,11 +8780,11 @@ - -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:8765: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8783: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8769: \$? = $ac_status" >&5 -+ echo "$as_me:8787: \$? = $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. -@@ -8779,7 +8797,7 @@ - $RM conftest* - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 - $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -8799,7 +8817,7 @@ - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 - $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then -@@ -9071,7 +9089,7 @@ - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 - $as_echo "$lt_prog_compiler_pic" >&6; } - - -@@ -9083,9 +9101,9 @@ - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works=no -@@ -9101,11 +9119,11 @@ - -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:9104: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9122: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9108: \$? = $ac_status" >&5 -+ echo "$as_me:9126: \$? = $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. -@@ -9118,7 +9136,7 @@ - $RM conftest* - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 - $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -9142,9 +9160,9 @@ - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works+set}" = set; then : -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works=no -@@ -9170,7 +9188,7 @@ - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 - $as_echo "$lt_cv_prog_compiler_static_works" >&6; } - - if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -9185,9 +9203,9 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then : -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o=no -@@ -9206,11 +9224,11 @@ - -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:9209: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9227: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9213: \$? = $ac_status" >&5 -+ echo "$as_me:9231: \$? = $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 -@@ -9232,7 +9250,7 @@ - $RM conftest* - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 - $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - -@@ -9240,9 +9258,9 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then : -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o=no -@@ -9261,11 +9279,11 @@ - -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:9264: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9282: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9268: \$? = $ac_status" >&5 -+ echo "$as_me:9286: \$? = $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 -@@ -9287,7 +9305,7 @@ - $RM conftest* - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 - $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - -@@ -9296,7 +9314,7 @@ - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 - $as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* -@@ -9304,10 +9322,10 @@ - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 - $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -@@ -9320,7 +9338,7 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= -@@ -9766,7 +9784,11 @@ - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -9777,7 +9799,27 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9791,9 +9833,16 @@ - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -9806,7 +9855,11 @@ - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -9817,7 +9870,27 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9831,9 +9904,16 @@ - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10045,16 +10125,42 @@ - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ cat >conftest.$ac_ext <<_ACEOF - int foo(void) {} - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -10310,7 +10416,7 @@ - fi - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 - $as_echo "$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no - -@@ -10347,16 +10453,16 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } 2>conftest.err; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -10370,11 +10476,11 @@ - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } - then - archive_cmds_need_lc=no - else -@@ -10385,7 +10491,7 @@ - cat conftest.err 1>&5 - fi - $RM conftest* -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 - $as_echo "$archive_cmds_need_lc" >&6; } - ;; - esac -@@ -10549,7 +10655,7 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - - if test "$GCC" = yes; then -@@ -10971,7 +11077,11 @@ - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int -@@ -10982,13 +11092,41 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes - fi -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -@@ -11208,244 +11346,5033 @@ - shlibpath_var=LD_LIBRARY_PATH - ;; - --*) -- dynamic_linker=no -- ;; -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+hardcode_action= -+if test -n "$hardcode_libdir_flag_spec" || -+ test -n "$runpath_var" || -+ test "X$hardcode_automatic" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$hardcode_direct" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && -+ test "$hardcode_minus_L" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action=unsupported -+fi -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+$as_echo "$hardcode_action" >&6; } -+ -+if test "$hardcode_action" = relink || -+ test "$inherit_rpath" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+ -+ -+ -+ -+ if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32* | cegcc*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ -+ *) -+ { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -+$as_echo_n "checking for shl_load... " >&6; } -+if test "${ac_cv_func_shl_load+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case declares shl_load. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef shl_load -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_shl_load || defined __stub___shl_load -+choke me -+#endif -+ -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_shl_load=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_shl_load=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+$as_echo "$ac_cv_func_shl_load" >&6; } -+if test "x$ac_cv_func_shl_load" = x""yes; then -+ lt_cv_dlopen="shl_load" -+else -+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dld_shl_load=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dld_shl_load=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -+$as_echo_n "checking for dlopen... " >&6; } -+if test "${ac_cv_func_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_dlopen || defined __stub___dlopen -+choke me -+#endif -+ -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+$as_echo "$ac_cv_func_dlopen" >&6; } -+if test "x$ac_cv_func_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_svld_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_svld_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+$as_echo_n "checking for dld_link in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dld_link (); -+int -+main () -+{ -+return dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dld_dld_link=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dld_dld_link=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+$as_echo_n "checking whether a program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+#line 12098 "configure" -+#include "confdefs.h" -+ -+#if HAVE_DLFCN_H -+#include -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ return status; -+} -+_LT_EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+$as_echo "$lt_cv_dlopen_self" >&6; } -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+#line 12194 "configure" -+#include "confdefs.h" -+ -+#if HAVE_DLFCN_H -+#include -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ return status; -+} -+_LT_EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+$as_echo "$lt_cv_dlopen_self_static" >&6; } -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+striplib= -+old_striplib= -+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+$as_echo_n "checking whether stripping libraries is possible... " >&6; } -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+ ;; -+ *) -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ ;; -+ esac -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ # Report which library types will actually be built -+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+$as_echo_n "checking if libtool supports shared libraries... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+$as_echo "$can_build_shared" >&6; } -+ -+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+$as_echo_n "checking whether to build shared libraries... " >&6; } -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+ aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -+$as_echo "$enable_shared" >&6; } -+ -+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+$as_echo_n "checking whether to build static libraries... " >&6; } -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -+$as_echo "$enable_static" >&6; } -+ -+ -+ -+ -+fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+CC="$lt_save_CC" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_config_commands="$ac_config_commands libtool" -+ -+ -+ -+ -+# Only expand once: -+ -+ -+ -+ -+# dolt, a replacement for libtool -+# Josh Triplett -+# Extract the first word of "bash", so it can be a program name with args. -+set dummy bash; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_DOLT_BASH+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $DOLT_BASH in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_DOLT_BASH="$DOLT_BASH" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+DOLT_BASH=$ac_cv_path_DOLT_BASH -+if test -n "$DOLT_BASH"; then -+ { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5 -+$as_echo "$DOLT_BASH" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5 -+$as_echo_n "checking if dolt supports this host... " >&6; } -+dolt_supported=yes -+if test x$DOLT_BASH = x; then -+ dolt_supported=no -+fi -+if test x$GCC != xyes; then -+ dolt_supported=no -+fi -+case $host in -+i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ -+|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) -+ pic_options='-fPIC' -+ ;; -+i?86-pc-cygwin*) -+ pic_options='-DDLL_EXPORT' -+ ;; -+i?86-apple-darwin*) -+ pic_options='-fno-common' -+ ;; -+*) -+ dolt_supported=no -+ ;; -+esac -+if test x$dolt_supported = xno ; then -+ { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5 -+$as_echo "no, falling back to libtool" >&6; } -+ LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' -+ LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -+else -+ { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5 -+$as_echo "yes, replacing libtool" >&6; } -+ -+ cat <<__DOLTCOMPILE__EOF__ >doltcompile -+#!$DOLT_BASH -+__DOLTCOMPILE__EOF__ -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+args=("$@") -+for ((arg=0; arg<${#args[@]}; arg++)) ; do -+ if test x"${args[$arg]}" = x-o ; then -+ objarg=$((arg+1)) -+ break -+ fi -+done -+if test x$objarg = x ; then -+ echo 'Error: no -o on compiler command line' 1>&2 -+ exit 1 -+fi -+lo="${args[$objarg]}" -+obj="${lo%.lo}" -+if test x"$lo" = x"$obj" ; then -+ echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 -+ exit 1 -+fi -+objbase="${obj##*/}" -+__DOLTCOMPILE__EOF__ -+ -+ if test x$enable_shared = xyes; then -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+libobjdir="${obj%$objbase}.libs" -+if test ! -d "$libobjdir" ; then -+ mkdir_out="$(mkdir "$libobjdir" 2>&1)" -+ mkdir_ret=$? -+ if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then -+ echo "$mkdir_out" 1>&2 -+ exit $mkdir_ret -+ fi -+fi -+pic_object="$libobjdir/$objbase.o" -+args[$objarg]="$pic_object" -+__DOLTCOMPILE__EOF__ -+ cat <<__DOLTCOMPILE__EOF__ >>doltcompile -+"\${args[@]}" $pic_options -DPIC || exit \$? -+__DOLTCOMPILE__EOF__ -+ fi -+ -+ if test x$enable_static = xyes; then -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+non_pic_object="$obj.o" -+args[$objarg]="$non_pic_object" -+__DOLTCOMPILE__EOF__ -+ if test x$enable_shared = xyes; then -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+"${args[@]}" >/dev/null 2>&1 || exit $? -+__DOLTCOMPILE__EOF__ -+ else -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+"${args[@]}" || exit $? -+__DOLTCOMPILE__EOF__ -+ fi -+ fi -+ -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+{ -+echo "# $lo - a libtool object file" -+echo "# Generated by doltcompile, not libtool" -+__DOLTCOMPILE__EOF__ -+ -+ if test x$enable_shared = xyes; then -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+echo "pic_object='.libs/${objbase}.o'" -+__DOLTCOMPILE__EOF__ -+ else -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+echo pic_object=none -+__DOLTCOMPILE__EOF__ -+ fi -+ -+ if test x$enable_static = xyes; then -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+echo "non_pic_object='${objbase}.o'" -+__DOLTCOMPILE__EOF__ -+ else -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+echo non_pic_object=none -+__DOLTCOMPILE__EOF__ -+ fi -+ -+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -+} > "$lo" -+__DOLTCOMPILE__EOF__ -+ -+ chmod +x doltcompile -+ LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' -+ LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' -+ -+ cat <<__DOLTLIBTOOL__EOF__ > doltlibtool -+#!$DOLT_BASH -+__DOLTLIBTOOL__EOF__ -+ cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool -+top_builddir_slash="${0%%doltlibtool}" -+: ${top_builddir_slash:=./} -+args=() -+modeok=false -+tagok=false -+for arg in "$@"; do -+ case "$arg" in -+ --silent) ;; -+ --mode=compile) modeok=true ;; -+ --tag=CC|--tag=CXX) tagok=true ;; -+ *) args[${#args[@]}]="$arg" ;; -+ esac -+done -+if $modeok && $tagok ; then -+ . ${top_builddir_slash}doltcompile "${args[@]}" -+else -+ exec ${top_builddir_slash}libtool "$@" -+fi -+__DOLTLIBTOOL__EOF__ -+ -+ chmod +x doltlibtool -+ LIBTOOL='$(top_builddir)/doltlibtool' -+fi -+ -+ -+# end dolt -+ -+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh -+all: -+ @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF -+# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac -+rm -f conftest.make -+fi -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ SET_MAKE= -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+$as_echo "$PKG_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+$as_echo "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi -+for ac_prog in flex lex -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_LEX+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$LEX"; then -+ ac_cv_prog_LEX="$LEX" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_LEX="$ac_prog" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+LEX=$ac_cv_prog_LEX -+if test -n "$LEX"; then -+ { $as_echo "$as_me:$LINENO: result: $LEX" >&5 -+$as_echo "$LEX" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$LEX" && break -+done -+test -n "$LEX" || LEX=":" -+ -+if test "x$LEX" != "x:"; then -+ cat >conftest.l <<_ACEOF -+%% -+a { ECHO; } -+b { REJECT; } -+c { yymore (); } -+d { yyless (1); } -+e { yyless (input () != 0); } -+f { unput (yytext[0]); } -+. { BEGIN INITIAL; } -+%% -+#ifdef YYTEXT_POINTER -+extern char *yytext; -+#endif -+int -+main (void) -+{ -+ return ! yylex () + ! yywrap (); -+} -+_ACEOF -+{ (ac_try="$LEX conftest.l" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$LEX conftest.l") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5 -+$as_echo_n "checking lex output file root... " >&6; } -+if test "${ac_cv_prog_lex_root+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ -+if test -f lex.yy.c; then -+ ac_cv_prog_lex_root=lex.yy -+elif test -f lexyy.c; then -+ ac_cv_prog_lex_root=lexyy -+else -+ { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -+$as_echo "$ac_cv_prog_lex_root" >&6; } -+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -+ -+if test -z "${LEXLIB+set}"; then -+ { $as_echo "$as_me:$LINENO: checking lex library" >&5 -+$as_echo_n "checking lex library... " >&6; } -+if test "${ac_cv_lib_lex+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ -+ ac_save_LIBS=$LIBS -+ ac_cv_lib_lex='none needed' -+ for ac_lib in '' -lfl -ll; do -+ LIBS="$ac_lib $ac_save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+`cat $LEX_OUTPUT_ROOT.c` -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_lex=$ac_lib -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ test "$ac_cv_lib_lex" != 'none needed' && break -+ done -+ LIBS=$ac_save_LIBS -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 -+$as_echo "$ac_cv_lib_lex" >&6; } -+ test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex -+fi -+ -+ -+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -+$as_echo_n "checking whether yytext is a pointer... " >&6; } -+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ # POSIX says lex can declare yytext either as a pointer or an array; the -+# default is implementation-dependent. Figure out which it is, since -+# not all implementations provide the %pointer and %array declarations. -+ac_cv_prog_lex_yytext_pointer=no -+ac_save_LIBS=$LIBS -+LIBS="$LEXLIB $ac_save_LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#define YYTEXT_POINTER 1 -+`cat $LEX_OUTPUT_ROOT.c` -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_prog_lex_yytext_pointer=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_save_LIBS -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 -+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } -+if test $ac_cv_prog_lex_yytext_pointer = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define YYTEXT_POINTER 1 -+_ACEOF -+ -+fi -+rm -f conftest.l $LEX_OUTPUT_ROOT.c -+ -+fi -+for ac_prog in 'bison -y' byacc -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_YACC+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$YACC"; then -+ ac_cv_prog_YACC="$YACC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_YACC="$ac_prog" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+YACC=$ac_cv_prog_YACC -+if test -n "$YACC"; then -+ { $as_echo "$as_me:$LINENO: result: $YACC" >&5 -+$as_echo "$YACC" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$YACC" && break -+done -+test -n "$YACC" || YACC="yacc" -+ -+# Check whether --enable-largefile was given. -+if test "${enable_largefile+set}" = set; then -+ enableval=$enable_largefile; -+fi -+ -+if test "$enable_largefile" != no; then -+ -+ { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -+$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -+if test "${ac_cv_sys_largefile_CC+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_sys_largefile_CC=no -+ if test "$GCC" != yes; then -+ ac_save_CC=$CC -+ while :; do -+ # IRIX 6.2 and later do not support large files by default, -+ # so use the C compiler's -n32 option if that helps. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext -+ CC="$CC -n32" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_sys_largefile_CC=' -n32'; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext -+ break -+ done -+ CC=$ac_save_CC -+ rm -f conftest.$ac_ext -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -+$as_echo "$ac_cv_sys_largefile_CC" >&6; } -+ if test "$ac_cv_sys_largefile_CC" != no; then -+ CC=$CC$ac_cv_sys_largefile_CC -+ fi -+ -+ { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+if test "${ac_cv_sys_file_offset_bits+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_sys_file_offset_bits=no; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _FILE_OFFSET_BITS 64 -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_sys_file_offset_bits=64; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_file_offset_bits=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -+$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -+case $ac_cv_sys_file_offset_bits in #( -+ no | unknown) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -+_ACEOF -+;; -+esac -+rm -rf conftest* -+ if test $ac_cv_sys_file_offset_bits = unknown; then -+ { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -+if test "${ac_cv_sys_large_files+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_sys_large_files=no; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _LARGE_FILES 1 -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_sys_large_files=1; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_large_files=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -+$as_echo "$ac_cv_sys_large_files" >&6; } -+case $ac_cv_sys_large_files in #( -+ no | unknown) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define _LARGE_FILES $ac_cv_sys_large_files -+_ACEOF -+;; -+esac -+rm -rf conftest* -+ fi -+fi -+ -+ -+ -+for ac_prog in cpp -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_RAWCPP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $RAWCPP in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" -+for as_dir in $as_dummy -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+RAWCPP=$ac_cv_path_RAWCPP -+if test -n "$RAWCPP"; then -+ { $as_echo "$as_me:$LINENO: result: $RAWCPP" >&5 -+$as_echo "$RAWCPP" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$RAWCPP" && break -+done -+test -n "$RAWCPP" || RAWCPP="${CPP}" -+ -+ -+# Check for flag to avoid builtin definitions - assumes unix is predefined, -+# which is not the best choice for supporting other OS'es, but covers most -+# of the ones we need for now. -+{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -undef" >&5 -+$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+Does cpp redefine unix ? -+_ACEOF -+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+else -+ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ RAWCPPFLAGS=-undef -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ # under Cygwin unix is still defined even with -undef -+ elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ RAWCPPFLAGS="-undef -ansi" -+ { $as_echo "$as_me:$LINENO: result: yes, with -ansi" >&5 -+$as_echo "yes, with -ansi" >&6; } -+ else -+ { { $as_echo "$as_me:$LINENO: error: ${RAWCPP} defines unix with or without -undef. I don't know what to do." >&5 -+$as_echo "$as_me: error: ${RAWCPP} defines unix with or without -undef. I don't know what to do." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+fi -+rm -f conftest.$ac_ext -+ -+{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -traditional" >&5 -+$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+Does cpp preserve "whitespace"? -+_ACEOF -+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+else -+ if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -+ RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { { $as_echo "$as_me:$LINENO: error: ${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." >&5 -+$as_echo "$as_me: error: ${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+fi -+rm -f conftest.$ac_ext -+ -+ -+# Extract the first word of "sed", so it can be a program name with args. -+set dummy sed; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_SED+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $SED in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_SED="$SED" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+SED=$ac_cv_path_SED -+if test -n "$SED"; then -+ { $as_echo "$as_me:$LINENO: result: $SED" >&5 -+$as_echo "$SED" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 -+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -+if test "${ac_cv_prog_cc_c99+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_prog_cc_c99=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+#include -+ -+// Check varargs macros. These examples are taken from C99 6.10.3.5. -+#define debug(...) fprintf (stderr, __VA_ARGS__) -+#define showlist(...) puts (#__VA_ARGS__) -+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -+static void -+test_varargs_macros (void) -+{ -+ int x = 1234; -+ int y = 5678; -+ debug ("Flag"); -+ debug ("X = %d\n", x); -+ showlist (The first, second, and third items.); -+ report (x>y, "x is %d but y is %d", x, y); -+} -+ -+// Check long long types. -+#define BIG64 18446744073709551615ull -+#define BIG32 4294967295ul -+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -+#if !BIG_OK -+ your preprocessor is broken; -+#endif -+#if BIG_OK -+#else -+ your preprocessor is broken; -+#endif -+static long long int bignum = -9223372036854775807LL; -+static unsigned long long int ubignum = BIG64; -+ -+struct incomplete_array -+{ -+ int datasize; -+ double data[]; -+}; -+ -+struct named_init { -+ int number; -+ const wchar_t *name; -+ double average; -+}; -+ -+typedef const char *ccp; -+ -+static inline int -+test_restrict (ccp restrict text) -+{ -+ // See if C++-style comments work. -+ // Iterate through items via the restricted pointer. -+ // Also check for declarations in for loops. -+ for (unsigned int i = 0; *(text+i) != '\0'; ++i) -+ continue; -+ return 0; -+} -+ -+// Check varargs and va_copy. -+static void -+test_varargs (const char *format, ...) -+{ -+ va_list args; -+ va_start (args, format); -+ va_list args_copy; -+ va_copy (args_copy, args); -+ -+ const char *str; -+ int number; -+ float fnumber; -+ -+ while (*format) -+ { -+ switch (*format++) -+ { -+ case 's': // string -+ str = va_arg (args_copy, const char *); -+ break; -+ case 'd': // int -+ number = va_arg (args_copy, int); -+ break; -+ case 'f': // float -+ fnumber = va_arg (args_copy, double); -+ break; -+ default: -+ break; -+ } -+ } -+ va_end (args_copy); -+ va_end (args); -+} -+ -+int -+main () -+{ -+ -+ // Check bool. -+ _Bool success = false; -+ -+ // Check restrict. -+ if (test_restrict ("String literal") == 0) -+ success = true; -+ char *restrict newvar = "Another string"; -+ -+ // Check varargs. -+ test_varargs ("s, d' f .", "string", 65, 34.234); -+ test_varargs_macros (); -+ -+ // Check flexible array members. -+ struct incomplete_array *ia = -+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); -+ ia->datasize = 10; -+ for (int i = 0; i < ia->datasize; ++i) -+ ia->data[i] = i * 1.234; -+ -+ // Check named initializers. -+ struct named_init ni = { -+ .number = 34, -+ .name = L"Test wide string", -+ .average = 543.34343, -+ }; -+ -+ ni.number = 58; -+ -+ int dynamic_array[ni.number]; -+ dynamic_array[ni.number - 1] = 543; -+ -+ // work around unused variable warnings -+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' -+ || dynamic_array[ni.number - 1] != 543); -+ -+ ; -+ return 0; -+} -+_ACEOF -+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c99=$ac_arg -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c99" != "xno" && break -+done -+rm -f conftest.$ac_ext -+CC=$ac_save_CC -+ -+fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c99" in -+ x) -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c99" -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 -+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -+esac -+ -+ -+ -+ -+ -+ -+if test "x$GCC" = xyes ; then -+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ -+-Wbad-function-cast" -+ case `$CC -dumpversion` in -+ 3.4.* | 4.*) -+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" -+ ;; -+ esac -+else -+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then -+ $as_echo_n "(cached) " >&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 -+int -+main () -+{ -+#ifndef __SUNPRO_C -+ (void) __SUNPRO_C; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl___SUNPRO_C=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl___SUNPRO_C=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then -+ SUNCC="yes" -+else -+ SUNCC="no" -+fi -+ -+ if test "x$SUNCC" = "xyes"; then -+ CWARNFLAGS="-v" -+ fi -+fi -+ -+# Check whether --enable-silent-rules was given. -+if test "${enable_silent_rules+set}" = set; then -+ enableval=$enable_silent_rules; -+fi -+ -+case $enable_silent_rules in -+yes) AM_DEFAULT_VERBOSITY=0;; -+no) AM_DEFAULT_VERBOSITY=1;; -+*) AM_DEFAULT_VERBOSITY=0;; -+esac -+AM_BACKSLASH='\' -+ -+ -+ -+ -+ -+ -+ -+# Check whether --enable-strict-compilation was given. -+if test "${enable_strict_compilation+set}" = set; then -+ enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -+else -+ STRICT_COMPILE=no -+fi -+ -+if test "x$STRICT_COMPILE" = "xyes"; then -+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then -+ $as_echo_n "(cached) " >&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 -+int -+main () -+{ -+#ifndef __SUNPRO_C -+ (void) __SUNPRO_C; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl___SUNPRO_C=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl___SUNPRO_C=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then -+ SUNCC="yes" -+else -+ SUNCC="no" -+fi -+ -+ { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 -+$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } -+if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then -+ $as_echo_n "(cached) " >&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 -+int -+main () -+{ -+#ifndef __INTEL_COMPILER -+ (void) __INTEL_COMPILER; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl___INTEL_COMPILER=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl___INTEL_COMPILER=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 -+$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } -+if test "x$ac_cv_have_decl___INTEL_COMPILER" = x""yes; then -+ INTELCC="yes" -+else -+ INTELCC="no" -+fi -+ -+ if test "x$GCC" = xyes ; then -+ STRICT_CFLAGS="-pedantic -Werror" -+ elif test "x$SUNCC" = "xyes"; then -+ STRICT_CFLAGS="-errwarn" -+ elif test "x$INTELCC" = "xyes"; then -+ STRICT_CFLAGS="-Werror" -+ fi -+fi -+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" -+ -+ -+ -+ -+# Check whether --with-release-version was given. -+if test "${with_release_version+set}" = set; then -+ withval=$with_release_version; RELEASE_VERSION="$withval" -+else -+ RELEASE_VERSION="" -+fi -+ -+ if test "x$RELEASE_VERSION" != "x"; then -+ PACKAGE="$PACKAGE-$RELEASE_VERSION" -+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -+ { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 -+$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} -+ fi -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` -+_ACEOF -+ -+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` -+ if test "x$PVM" = "x"; then -+ PVM="0" -+ fi -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION_MINOR $PVM -+_ACEOF -+ -+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` -+ if test "x$PVP" = "x"; then -+ PVP="0" -+ fi -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION_PATCHLEVEL $PVP -+_ACEOF -+ -+ -+ -+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ -+echo 'git directory not found: installing possibly empty changelog.' >&2)" -+ -+distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' -+ -+ -+ -+ -+ -+if test x$APP_MAN_SUFFIX = x ; then -+ APP_MAN_SUFFIX=1 -+fi -+if test x$APP_MAN_DIR = x ; then -+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -+fi -+ -+if test x$LIB_MAN_SUFFIX = x ; then -+ LIB_MAN_SUFFIX=3 -+fi -+if test x$LIB_MAN_DIR = x ; then -+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -+fi -+ -+if test x$FILE_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) FILE_MAN_SUFFIX=4 ;; -+ *) FILE_MAN_SUFFIX=5 ;; -+ esac -+fi -+if test x$FILE_MAN_DIR = x ; then -+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -+fi -+ -+if test x$MISC_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) MISC_MAN_SUFFIX=5 ;; -+ *) MISC_MAN_SUFFIX=7 ;; -+ esac -+fi -+if test x$MISC_MAN_DIR = x ; then -+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -+fi -+ -+if test x$DRIVER_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) DRIVER_MAN_SUFFIX=7 ;; -+ *) DRIVER_MAN_SUFFIX=4 ;; -+ esac -+fi -+if test x$DRIVER_MAN_DIR = x ; then -+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -+fi -+ -+if test x$ADMIN_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) ADMIN_MAN_SUFFIX=1m ;; -+ *) ADMIN_MAN_SUFFIX=8 ;; -+ esac -+fi -+if test x$ADMIN_MAN_DIR = x ; then -+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow -+# easier overrides at build time. -+XSERVER_CFLAGS='$(CWARNFLAGS)' -+ -+ -+# Check whether --with-dtrace was given. -+if test "${with_dtrace+set}" = set; then -+ withval=$with_dtrace; WDTRACE=$withval -+else -+ WDTRACE=auto -+fi -+ -+if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then -+ # Extract the first word of "dtrace", so it can be a program name with args. -+set dummy dtrace; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_DTRACE+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $DTRACE in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_dummy="$PATH:/usr/sbin" -+for as_dir in $as_dummy -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not_found" -+ ;; -+esac -+fi -+DTRACE=$ac_cv_path_DTRACE -+if test -n "$DTRACE"; then -+ { $as_echo "$as_me:$LINENO: result: $DTRACE" >&5 -+$as_echo "$DTRACE" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ if test "x$DTRACE" = "xnot_found" ; then -+ if test "x$WDTRACE" = "xyes" ; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: dtrace requested but not found -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: dtrace requested but not found -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+ fi -+ WDTRACE="no" -+ else -+ if test "${ac_cv_header_sys_sdt_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5 -+$as_echo_n "checking for sys/sdt.h... " >&6; } -+if test "${ac_cv_header_sys_sdt_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5 -+$as_echo "$ac_cv_header_sys_sdt_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking sys/sdt.h usability" >&5 -+$as_echo_n "checking sys/sdt.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking sys/sdt.h presence" >&5 -+$as_echo_n "checking sys/sdt.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5 -+$as_echo_n "checking for sys/sdt.h... " >&6; } -+if test "${ac_cv_header_sys_sdt_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_header_sys_sdt_h=$ac_header_preproc -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5 -+$as_echo "$ac_cv_header_sys_sdt_h" >&6; } -+ -+fi -+if test "x$ac_cv_header_sys_sdt_h" = x""yes; then -+ HAS_SDT_H="yes" -+else -+ HAS_SDT_H="no" -+fi -+ -+ -+ if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then -+ WDTRACE="no" -+ fi -+ fi -+fi -+if test "x$WDTRACE" != "xno" ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XSERVER_DTRACE 1 -+_ACEOF -+ -+ -+# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into -+# object files, and require linking with those as relocatable objects, not .a -+# archives. MacOS X handles all this in the normal compiler toolchain, and on -+# some releases (like Tiger), will error out on dtrace -G. For now, other -+# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux -+# ports appear to, based on my web searches, but have not yet been tested). -+ case $host_os in -+ darwin*) SPECIAL_DTRACE_OBJECTS=no ;; -+ *) SPECIAL_DTRACE_OBJECTS=yes ;; -+ esac -+fi -+ if test "x$WDTRACE" != "xno"; then -+ XSERVER_DTRACE_TRUE= -+ XSERVER_DTRACE_FALSE='#' -+else -+ XSERVER_DTRACE_TRUE='#' -+ XSERVER_DTRACE_FALSE= -+fi -+ -+ if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"; then -+ SPECIAL_DTRACE_OBJECTS_TRUE= -+ SPECIAL_DTRACE_OBJECTS_FALSE='#' -+else -+ SPECIAL_DTRACE_OBJECTS_TRUE='#' -+ SPECIAL_DTRACE_OBJECTS_FALSE= -+fi -+ -+ -+ -+ -+ -+ -+ -+ac_header_dirent=no -+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include <$ac_hdr> -+ -+int -+main () -+{ -+if ((DIR *) 0) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_Header=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -+_ACEOF -+ -+ac_header_dirent=$ac_hdr; break -+fi -+ -+done -+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -+if test $ac_header_dirent = dirent.h; then -+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char opendir (); -+int -+main () -+{ -+return opendir (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' dir; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_opendir=$ac_res -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_opendir+set}" = set; then -+ : -+else -+ ac_cv_search_opendir=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -+$as_echo "$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+else -+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char opendir (); -+int -+main () -+{ -+return opendir (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' x; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_opendir=$ac_res -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_opendir+set}" = set; then -+ : -+else -+ ac_cv_search_opendir=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -+$as_echo "$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+fi -+ -+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_header_stdc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_header_stdc=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_header_stdc=no -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF -+ -+fi -+ -+ -+ -+ -+ -+ -+ -+for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -+if test "${ac_cv_c_const+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+/* FIXME: Include the comments suggested by Paul. */ -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this. */ -+ typedef int charset[2]; -+ const charset cs; -+ /* SunOS 4.1.1 cc rejects this. */ -+ char const *const *pcpcc; -+ char **ppc; -+ /* NEC SVR4.0.2 mips cc rejects this. */ -+ struct point {int x, y;}; -+ static struct point const zero = {0,0}; -+ /* AIX XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ pcpcc = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; -+ { /* SCO 3.2v4 cc rejects this. */ -+ char *t; -+ char const *s = 0 ? (char *) 0 : (char const *) 0; -+ -+ *t++ = 0; -+ if (s) return 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* AIX XL C 1.02.0.0 rejects this saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; -+ } -+ return !cs[0] && !zero.x; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_const=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+ ac_cv_c_const=no - fi - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+$as_echo "$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define const /**/ -+_ACEOF -+ - fi - - -+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -+$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -+if test "${ac_cv_c_bigendian+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_c_bigendian=unknown -+ # See if we're dealing with a universal compiler. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifndef __APPLE_CC__ -+ not a universal capable compiler -+ #endif -+ typedef int dummy; -+ -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ -+ # Check for potential -arch flags. It is not universal unless -+ # there are some -arch flags. Note that *ppc* also matches -+ # ppc64. This check is also rather less than ideal. -+ case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( -+ *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; -+ esac -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if sys/param.h defines the BYTE_ORDER macro. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ #include - -+int -+main () -+{ -+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ -+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ -+ && LITTLE_ENDIAN) -+ bogus endian macros -+ #endif - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ # It does; now see whether it defined to BIG_ENDIAN or not. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ #include - -+int -+main () -+{ -+#if BYTE_ORDER != BIG_ENDIAN -+ not big endian -+ #endif - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_bigendian=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_c_bigendian=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include - -+int -+main () -+{ -+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) -+ bogus endian macros -+ #endif - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ # It does; now see whether it defined to _BIG_ENDIAN or not. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include - -+int -+main () -+{ -+#ifndef _BIG_ENDIAN -+ not big endian -+ #endif - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_bigendian=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_c_bigendian=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # Compile a test program. -+ if test "$cross_compiling" = yes; then -+ # Try to guess by grepping values from an object file. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+short int ascii_mm[] = -+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+ short int ascii_ii[] = -+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+ int use_ascii (int i) { -+ return ascii_mm[i] + ascii_ii[i]; -+ } -+ short int ebcdic_ii[] = -+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+ short int ebcdic_mm[] = -+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+ int use_ebcdic (int i) { -+ return ebcdic_mm[i] + ebcdic_ii[i]; -+ } -+ extern int foo; - -+int -+main () -+{ -+return use_ascii (foo) == use_ebcdic (foo); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then -+ ac_cv_c_bigendian=yes -+ fi -+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -+ if test "$ac_cv_c_bigendian" = unknown; then -+ ac_cv_c_bigendian=no -+ else -+ # finding both strings is unlikely to happen, but who knows? -+ ac_cv_c_bigendian=unknown -+ fi -+ fi -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+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 -+int -+main () -+{ - -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long int l; -+ char c[sizeof (long int)]; -+ } u; -+ u.l = 1; -+ return u.c[sizeof (long int) - 1] == 1; - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_bigendian=no -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+( exit $ac_status ) -+ac_cv_c_bigendian=yes -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi - - -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -+$as_echo "$ac_cv_c_bigendian" >&6; } -+ case $ac_cv_c_bigendian in #( -+ yes) -+ ENDIAN="X_BIG_ENDIAN";; #( -+ no) -+ ENDIAN="X_LITTLE_ENDIAN" ;; #( -+ universal) - -+cat >>confdefs.h <<\_ACEOF -+#define AC_APPLE_UNIVERSAL_BUILD 1 -+_ACEOF - -+ ;; #( -+ *) -+ { { $as_echo "$as_me:$LINENO: error: unknown endianness -+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -+$as_echo "$as_me: error: unknown endianness -+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -+ { (exit 1); exit 1; }; } ;; -+ esac - - -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5 -+$as_echo_n "checking size of unsigned long... " >&6; } -+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+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 -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)]; -+test_array [0] = 0 - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=0 ac_mid=0 -+ while :; do -+ 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 -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; -+test_array [0] = 0 - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ 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 -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)]; -+test_array [0] = 0 - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ 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 -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)]; -+test_array [0] = 0 - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_lo= ac_hi= -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -+ 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 -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; -+test_array [0] = 0 - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_lo=`expr '(' $ac_mid ')' + 1` -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in -+?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -+'') if test "$ac_cv_type_unsigned_long" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (unsigned long) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_unsigned_long=0 -+ fi ;; -+esac -+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 -+static long int longval () { return (long int) (sizeof (unsigned long)); } -+static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); } -+#include -+#include -+int -+main () -+{ - -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (((long int) (sizeof (unsigned long))) < 0) -+ { -+ long int i = longval (); -+ if (i != ((long int) (sizeof (unsigned long)))) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (unsigned long)))) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sizeof_unsigned_long=`cat conftest.val` -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+( exit $ac_status ) -+if test "$ac_cv_type_unsigned_long" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (unsigned long) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_unsigned_long=0 -+ fi -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f conftest.val -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } - - - -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -+_ACEOF - - -+if test "$ac_cv_sizeof_unsigned_long" = 8; then - -+cat >>confdefs.h <<\_ACEOF -+#define _XSERVER64 1 -+_ACEOF - -+fi - -+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5 -+$as_echo_n "checking for pid_t... " >&6; } -+if test "${ac_cv_type_pid_t+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_type_pid_t=no -+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 -+int -+main () -+{ -+if (sizeof (pid_t)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ 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 -+int -+main () -+{ -+if (sizeof ((pid_t))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_type_pid_t=yes -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -+$as_echo "$ac_cv_type_pid_t" >&6; } -+if test "x$ac_cv_type_pid_t" = x""yes; then -+ : -+else - -+cat >>confdefs.h <<_ACEOF -+#define pid_t int -+_ACEOF - -+fi - - -+# Checks for headers/macros for byte swapping -+# Known variants: -+# bswap_16, bswap_32, bswap_64 (glibc) -+# __swap16, __swap32, __swap64 (OpenBSD) -+# bswap16, bswap32, bswap64 (other BSD's) -+# and a fallback to local macros if none of the above are found - -+# if is found, assume it's the correct version - -+for ac_header in byteswap.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - -+fi - -+done - - -+# if is found, have to check which version -+if test "${ac_cv_header_sys_endian_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5 -+$as_echo_n "checking for sys/endian.h... " >&6; } -+if test "${ac_cv_header_sys_endian_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5 -+$as_echo "$ac_cv_header_sys_endian_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking sys/endian.h usability" >&5 -+$as_echo_n "checking sys/endian.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking sys/endian.h presence" >&5 -+$as_echo_n "checking sys/endian.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || -- test -n "$runpath_var" || -- test "X$hardcode_automatic" = "Xyes" ; then -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -- # We can hardcode non-existent directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -- fi -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5 -+$as_echo_n "checking for sys/endian.h... " >&6; } -+if test "${ac_cv_header_sys_endian_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported -+ ac_cv_header_sys_endian_h=$ac_header_preproc - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 --$as_echo "$hardcode_action" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5 -+$as_echo "$ac_cv_header_sys_endian_h" >&6; } - --if test "$hardcode_action" = relink || -- test "$inherit_rpath" = yes; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless -+fi -+if test "x$ac_cv_header_sys_endian_h" = x""yes; then -+ HAVE_SYS_ENDIAN_H="yes" -+else -+ HAVE_SYS_ENDIAN_H="no" - fi - - - -+if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then -+ { $as_echo "$as_me:$LINENO: checking for __swap16 variant of byteswapping macros" >&5 -+$as_echo_n "checking for __swap16 variant of byteswapping macros... " >&6; } -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+#include -+#include - -+int -+main () -+{ - -- if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -- -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -- -- mingw* | pw32* | cegcc*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+int a = 1, b; -+b = __swap16(a); - -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -+ ; -+ return 0; -+} - -- darwin*) -- # if libdl is installed we need to link against it -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ SYS_ENDIAN__SWAP='yes' - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ SYS_ENDIAN__SWAP='no' -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ { $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN__SWAP" >&5 -+$as_echo "$SYS_ENDIAN__SWAP" >&6; } -+ -+ { $as_echo "$as_me:$LINENO: checking for bswap16 variant of byteswapping macros" >&5 -+$as_echo_n "checking for bswap16 variant of byteswapping macros... " >&6; } -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); -+#include -+#include -+ - int - main () - { --return dlopen (); -+ -+int a = 1, b; -+b = bswap16(a); -+ - ; - return 0; - } -+ - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_dl_dlopen=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ SYS_ENDIAN_BSWAP='yes' - else -- ac_cv_lib_dl_dlopen=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ SYS_ENDIAN_BSWAP='no' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else - -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ { $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN_BSWAP" >&5 -+$as_echo "$SYS_ENDIAN_BSWAP" >&6; } - --fi -+ if test "$SYS_ENDIAN_BSWAP" = "yes" ; then -+ USE_SYS_ENDIAN_H=yes -+ BSWAP=bswap -+ else -+ if test "$SYS_ENDIAN__SWAP" = "yes" ; then -+ USE_SYS_ENDIAN_H=yes -+ BSWAP=__swap -+ else -+ USE_SYS_ENDIAN_H=no -+ fi -+ fi - -- ;; -+ if test "$USE_SYS_ENDIAN_H" = "yes" ; then - -- *) -- ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" --if test "x$ac_cv_func_shl_load" = x""yes; then : -- lt_cv_dlopen="shl_load" --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 --$as_echo_n "checking for shl_load in -ldld... " >&6; } --if test "${ac_cv_lib_dld_shl_load+set}" = set; then : -+cat >>confdefs.h <<\_ACEOF -+#define USE_SYS_ENDIAN_H 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define bswap_16 ${BSWAP}16 -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define bswap_32 ${BSWAP}32 -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define bswap_64 ${BSWAP}64 -+_ACEOF -+ -+ fi -+fi -+ -+{ $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -+$as_echo_n "checking for dlopen... " >&6; } -+if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -11453,41 +16380,72 @@ - #ifdef __cplusplus - extern "C" - #endif --char shl_load (); -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_dlopen || defined __stub___dlopen -+choke me -+#endif -+ - int - main () - { --return shl_load (); -+return dlopen (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_dld_shl_load=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_dlopen=yes - else -- ac_cv_lib_dld_shl_load=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_dlopen=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 --$as_echo "$ac_cv_lib_dld_shl_load" >&6; } --if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" --else -- ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" --if test "x$ac_cv_func_dlopen" = x""yes; then : -- lt_cv_dlopen="dlopen" -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+$as_echo "$ac_cv_func_dlopen" >&6; } -+if test "x$ac_cv_func_dlopen" = x""yes; then -+ : - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then : -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -11505,29 +16463,80 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dl_dlopen=yes - else -- ac_cv_lib_dl_dlopen=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 --$as_echo_n "checking for dlopen in -lsvld... " >&6; } --if test "${ac_cv_lib_svld_dlopen+set}" = set; then : -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+ DLOPEN_LIBS="-ldl" -+fi -+ -+fi -+ -+ -+ -+for ac_func in vprintf -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -11535,38 +16544,93 @@ - #ifdef __cplusplus - extern "C" - #endif --char dlopen (); -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ - int - main () - { --return dlopen (); -+return $ac_func (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_svld_dlopen=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- ac_cv_lib_svld_dlopen=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 --$as_echo "$ac_cv_lib_svld_dlopen" >&6; } --if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 --$as_echo_n "checking for dld_link in -ldld... " >&6; } --if test "${ac_cv_lib_dld_dld_link+set}" = set; then : -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 -+$as_echo_n "checking for _doprnt... " >&6; } -+if test "${ac_cv_func__doprnt+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define _doprnt to an innocuous variant, in case declares _doprnt. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define _doprnt innocuous__doprnt -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char _doprnt (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef _doprnt - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -11574,1818 +16638,3091 @@ - #ifdef __cplusplus - extern "C" - #endif --char dld_link (); -+char _doprnt (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub__doprnt || defined __stub____doprnt -+choke me -+#endif -+ - int - main () - { --return dld_link (); -+return _doprnt (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_dld_dld_link=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func__doprnt=yes - else -- ac_cv_lib_dld_dld_link=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func__doprnt=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 --$as_echo "$ac_cv_lib_dld_dld_link" >&6; } --if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -+$as_echo "$ac_cv_func__doprnt" >&6; } -+if test "x$ac_cv_func__doprnt" = x""yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_DOPRNT 1 -+_ACEOF - - fi - -- - fi -+done - - --fi - - --fi - - --fi - -- ;; -- esac - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - -- save_LDFLAGS="$LDFLAGS" -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 --$as_echo_n "checking whether a program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self+set}" = set; then : -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_func in geteuid getuid link memmove memset mkstemp strchr strrchr \ -+ strtol getopt getopt_long vsnprintf walkcontext backtrace \ -+ getisax getzoneid shmctl64 strcasestr ffs -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<_LT_EOF --#line 11647 "configure" --#include "confdefs.h" -- --#if HAVE_DLFCN_H --#include --#endif -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --#include -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL -+#ifdef __STDC__ -+# include - #else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif -+# include - #endif - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me - #endif - --void fnord() { int i=42;} --int main () -+int -+main () - { -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); -- -- return status; -+return $ac_func (); -+ ; -+ return 0; - } --_LT_EOF -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -- (eval $ac_link) 2>&5 -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) >&5 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self=no -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi --rm -fr conftest* - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 --$as_echo "$lt_cv_dlopen_self" >&6; } -+done - -- if test "x$lt_cv_dlopen_self" = xyes; then -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 --$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self_static+set}" = set; then : -+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -+# for constant arguments. Useless! -+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 -+$as_echo_n "checking for working alloca.h... " >&6; } -+if test "${ac_cv_working_alloca_h+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self_static=cross -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+char *p = (char *) alloca (2 * sizeof (int)); -+ if (p) return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_working_alloca_h=yes - else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<_LT_EOF --#line 11743 "configure" --#include "confdefs.h" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --#if HAVE_DLFCN_H --#include --#endif -+ ac_cv_working_alloca_h=no -+fi - --#include -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -+$as_echo "$ac_cv_working_alloca_h" >&6; } -+if test $ac_cv_working_alloca_h = yes; then - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_ALLOCA_H 1 -+_ACEOF - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY -+fi -+ -+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 -+$as_echo_n "checking for alloca... " >&6; } -+if test "${ac_cv_func_alloca_works+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+#else -+# ifdef _MSC_VER -+# include -+# define alloca _alloca -+# else -+# ifdef HAVE_ALLOCA_H -+# include - # else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca /* predefined by HP cc +Olibcalls */ -+char *alloca (); - # endif -+# endif - # endif -+# endif - #endif - --void fnord() { int i=42;} --int main () -+int -+main () - { -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); -- -- return status; -+char *p = (char *) alloca (1); -+ if (p) return 0; -+ ; -+ return 0; - } --_LT_EOF -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -- (eval $ac_link) 2>&5 -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) >&5 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self_static=no -- fi --fi --rm -fr conftest* -- -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_alloca_works=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_alloca_works=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 --$as_echo "$lt_cv_dlopen_self_static" >&6; } -- fi -- -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -- -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -+$as_echo "$ac_cv_func_alloca_works" >&6; } - -+if test $ac_cv_func_alloca_works = yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_ALLOCA 1 -+_ACEOF - -+else -+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions -+# that cause trouble. Some versions do not even contain alloca or -+# contain a buggy version. If you still want to use their alloca, -+# use ar to extract alloca.o from them instead of compiling alloca.c. - -+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext - -+cat >>confdefs.h <<\_ACEOF -+#define C_ALLOCA 1 -+_ACEOF - - -+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -+if test "${ac_cv_os_cray+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#if defined CRAY && ! defined CRAY2 -+webecray -+#else -+wenotbecray -+#endif - -- -- -- -- -- -- -- -- -- --striplib= --old_striplib= --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 --$as_echo_n "checking whether stripping libraries is possible... " >&6; } --if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "webecray" >/dev/null 2>&1; then -+ ac_cv_os_cray=yes - else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- old_striplib="$STRIP -S" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- fi -- ;; -- *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- ;; -- esac -+ ac_cv_os_cray=no - fi -+rm -f conftest* - -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -+$as_echo "$ac_cv_os_cray" >&6; } -+if test $ac_cv_os_cray = yes; then -+ for ac_func in _getb67 GETB67 getb67; do -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef $ac_func - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_var=no" -+fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - -+cat >>confdefs.h <<_ACEOF -+#define CRAY_STACKSEG_END $ac_func -+_ACEOF - -+ break -+fi - -+ done -+fi - -- # Report which library types will actually be built -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } -- test "$can_build_shared" = "no" && enable_shared=no -+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -+$as_echo_n "checking stack direction for C alloca... " >&6; } -+if test "${ac_cv_c_stack_direction+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_c_stack_direction=0 -+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 -+int -+find_stack_direction () -+{ -+ static char *addr = 0; -+ auto char dummy; -+ if (addr == 0) -+ { -+ addr = &dummy; -+ return find_stack_direction (); -+ } -+ else -+ return (&dummy > addr) ? 1 : -1; -+} - -- # On AIX, shared libraries and static libraries use the same namespace, and -- # are all built from PIC. -- case $host_os in -- aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+int -+main () -+{ -+ return find_stack_direction () < 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_stack_direction=1 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- aix[4-9]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; -- esac -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -+( exit $ac_status ) -+ac_cv_c_stack_direction=-1 -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } -- # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } - -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -+$as_echo "$ac_cv_c_stack_direction" >&6; } - -+cat >>confdefs.h <<_ACEOF -+#define STACK_DIRECTION $ac_cv_c_stack_direction -+_ACEOF - - - fi --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --CC="$lt_save_CC" - -+{ $as_echo "$as_me:$LINENO: checking for getdtablesize" >&5 -+$as_echo_n "checking for getdtablesize... " >&6; } -+if test "${ac_cv_func_getdtablesize+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define getdtablesize to an innocuous variant, in case declares getdtablesize. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define getdtablesize innocuous_getdtablesize - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getdtablesize (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef getdtablesize - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char getdtablesize (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_getdtablesize || defined __stub___getdtablesize -+choke me -+#endif - -+int -+main () -+{ -+return getdtablesize (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_getdtablesize=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_getdtablesize=no -+fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getdtablesize" >&5 -+$as_echo "$ac_cv_func_getdtablesize" >&6; } -+if test "x$ac_cv_func_getdtablesize" = x""yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_GETDTABLESIZE 1 -+_ACEOF - -+fi - -+{ $as_echo "$as_me:$LINENO: checking for getifaddrs" >&5 -+$as_echo_n "checking for getifaddrs... " >&6; } -+if test "${ac_cv_func_getifaddrs+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define getifaddrs to an innocuous variant, in case declares getifaddrs. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define getifaddrs innocuous_getifaddrs - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getifaddrs (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -- ac_config_commands="$ac_config_commands libtool" -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef getifaddrs - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char getifaddrs (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_getifaddrs || defined __stub___getifaddrs -+choke me -+#endif - -+int -+main () -+{ -+return getifaddrs (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_getifaddrs=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Only expand once: -+ ac_cv_func_getifaddrs=no -+fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs" >&5 -+$as_echo "$ac_cv_func_getifaddrs" >&6; } -+if test "x$ac_cv_func_getifaddrs" = x""yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_GETIFADDRS 1 -+_ACEOF - -+fi - --# dolt, a replacement for libtool --# Josh Triplett --# Extract the first word of "bash", so it can be a program name with args. --set dummy bash; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_DOLT_BASH+set}" = set; then : -+{ $as_echo "$as_me:$LINENO: checking for getpeereid" >&5 -+$as_echo_n "checking for getpeereid... " >&6; } -+if test "${ac_cv_func_getpeereid+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- case $DOLT_BASH in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_DOLT_BASH="$DOLT_BASH" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define getpeereid to an innocuous variant, in case declares getpeereid. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define getpeereid innocuous_getpeereid - -- ;; --esac --fi --DOLT_BASH=$ac_cv_path_DOLT_BASH --if test -n "$DOLT_BASH"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5 --$as_echo "$DOLT_BASH" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getpeereid (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5 --$as_echo_n "checking if dolt supports this host... " >&6; } --dolt_supported=yes --if test x$DOLT_BASH = x; then -- dolt_supported=no --fi --if test x$GCC != xyes; then -- dolt_supported=no --fi --case $host in --i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ --|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) -- pic_options='-fPIC' -- ;; --i?86-pc-cygwin*) -- pic_options='-DDLL_EXPORT' -- ;; --i?86-apple-darwin*) -- pic_options='-fno-common' -- ;; --*) -- dolt_supported=no -- ;; -+#undef getpeereid -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char getpeereid (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_getpeereid || defined __stub___getpeereid -+choke me -+#endif -+ -+int -+main () -+{ -+return getpeereid (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --if test x$dolt_supported = xno ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5 --$as_echo "no, falling back to libtool" >&6; } -- LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' -- LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_getpeereid=yes - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5 --$as_echo "yes, replacing libtool" >&6; } -- -- cat <<__DOLTCOMPILE__EOF__ >doltcompile --#!$DOLT_BASH --__DOLTCOMPILE__EOF__ -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --args=("$@") --for ((arg=0; arg<${#args[@]}; arg++)) ; do -- if test x"${args[$arg]}" = x-o ; then -- objarg=$((arg+1)) -- break -- fi --done --if test x$objarg = x ; then -- echo 'Error: no -o on compiler command line' 1>&2 -- exit 1 --fi --lo="${args[$objarg]}" --obj="${lo%.lo}" --if test x"$lo" = x"$obj" ; then -- echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 -- exit 1 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_getpeereid=no - fi --objbase="${obj##*/}" --__DOLTCOMPILE__EOF__ - -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --libobjdir="${obj%$objbase}.libs" --if test ! -d "$libobjdir" ; then -- mkdir_out="$(mkdir "$libobjdir" 2>&1)" -- mkdir_ret=$? -- if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then -- echo "$mkdir_out" 1>&2 -- exit $mkdir_ret -- fi -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --pic_object="$libobjdir/$objbase.o" --args[$objarg]="$pic_object" --__DOLTCOMPILE__EOF__ -- cat <<__DOLTCOMPILE__EOF__ >>doltcompile --"\${args[@]}" $pic_options -DPIC || exit \$? --__DOLTCOMPILE__EOF__ -- fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpeereid" >&5 -+$as_echo "$ac_cv_func_getpeereid" >&6; } -+if test "x$ac_cv_func_getpeereid" = x""yes; then - -- if test x$enable_static = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --non_pic_object="$obj.o" --args[$objarg]="$non_pic_object" --__DOLTCOMPILE__EOF__ -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --"${args[@]}" >/dev/null 2>&1 || exit $? --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --"${args[@]}" || exit $? --__DOLTCOMPILE__EOF__ -- fi -- fi -+cat >>confdefs.h <<\_ACEOF -+#define HAS_GETPEEREID 1 -+_ACEOF - -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --{ --echo "# $lo - a libtool object file" --echo "# Generated by doltcompile, not libtool" --__DOLTCOMPILE__EOF__ -+fi - -- if test x$enable_shared = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo "pic_object='.libs/${objbase}.o'" --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo pic_object=none --__DOLTCOMPILE__EOF__ -- fi -+{ $as_echo "$as_me:$LINENO: checking for getpeerucred" >&5 -+$as_echo_n "checking for getpeerucred... " >&6; } -+if test "${ac_cv_func_getpeerucred+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define getpeerucred to an innocuous variant, in case declares getpeerucred. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define getpeerucred innocuous_getpeerucred - -- if test x$enable_static = xyes; then -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo "non_pic_object='${objbase}.o'" --__DOLTCOMPILE__EOF__ -- else -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --echo non_pic_object=none --__DOLTCOMPILE__EOF__ -- fi -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getpeerucred (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile --} > "$lo" --__DOLTCOMPILE__EOF__ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -- chmod +x doltcompile -- LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' -- LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' -+#undef getpeerucred - -- cat <<__DOLTLIBTOOL__EOF__ > doltlibtool --#!$DOLT_BASH --__DOLTLIBTOOL__EOF__ -- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool --top_builddir_slash="${0%%doltlibtool}" --: ${top_builddir_slash:=./} --args=() --modeok=false --tagok=false --for arg in "$@"; do -- case "$arg" in -- --silent) ;; -- --mode=compile) modeok=true ;; -- --tag=CC|--tag=CXX) tagok=true ;; -- *) args[${#args[@]}]="$arg" ;; -- esac --done --if $modeok && $tagok ; then -- . ${top_builddir_slash}doltcompile "${args[@]}" -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char getpeerucred (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_getpeerucred || defined __stub___getpeerucred -+choke me -+#endif -+ -+int -+main () -+{ -+return getpeerucred (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_getpeerucred=yes - else -- exec ${top_builddir_slash}libtool "$@" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_getpeerucred=no - fi --__DOLTLIBTOOL__EOF__ - -- chmod +x doltlibtool -- LIBTOOL='$(top_builddir)/doltlibtool' -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpeerucred" >&5 -+$as_echo "$ac_cv_func_getpeerucred" >&6; } -+if test "x$ac_cv_func_getpeerucred" = x""yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_GETPEERUCRED 1 -+_ACEOF - --# end dolt -+fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } --set x ${MAKE-make} --ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : -+{ $as_echo "$as_me:$LINENO: checking for strlcat" >&5 -+$as_echo_n "checking for strlcat... " >&6; } -+if test "${ac_cv_func_strlcat+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- cat >conftest.make <<\_ACEOF --SHELL = /bin/sh --all: -- @echo '@@@%%%=$(MAKE)=@@@%%%' -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --case `${MAKE-make} -f conftest.make 2>/dev/null` in -- *@@@%%%=?*=@@@%%%*) -- eval ac_cv_prog_make_${ac_make}_set=yes;; -- *) -- eval ac_cv_prog_make_${ac_make}_set=no;; -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define strlcat to an innocuous variant, in case declares strlcat. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define strlcat innocuous_strlcat -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char strlcat (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef strlcat -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strlcat (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_strlcat || defined __stub___strlcat -+choke me -+#endif -+ -+int -+main () -+{ -+return strlcat (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --rm -f conftest.make -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_strlcat=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_strlcat=no - fi --if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- SET_MAKE= -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcat" >&5 -+$as_echo "$ac_cv_func_strlcat" >&6; } -+if test "x$ac_cv_func_strlcat" = x""yes; then -+ HAVE_STRLCAT=yes -+else -+ HAVE_STRLCAT=no -+fi -+ -+ if test x$HAVE_STRLCAT = xno; then -+ NEED_STRLCAT_TRUE= -+ NEED_STRLCAT_FALSE='#' -+else -+ NEED_STRLCAT_TRUE='#' -+ NEED_STRLCAT_FALSE= -+fi -+ -+{ $as_echo "$as_me:$LINENO: checking for strlcpy" >&5 -+$as_echo_n "checking for strlcpy... " >&6; } -+if test "${ac_cv_func_strlcpy+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define strlcpy to an innocuous variant, in case declares strlcpy. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define strlcpy innocuous_strlcpy -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char strlcpy (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef strlcpy -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strlcpy (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_strlcpy || defined __stub___strlcpy -+choke me -+#endif -+ -+int -+main () -+{ -+return strlcpy (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_strlcpy=yes - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- SET_MAKE="MAKE=${MAKE-make}" --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_strlcpy=no -+fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcpy" >&5 -+$as_echo "$ac_cv_func_strlcpy" >&6; } -+if test "x$ac_cv_func_strlcpy" = x""yes; then - --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. --set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+cat >>confdefs.h <<\_ACEOF -+#define HAS_STRLCPY 1 -+_ACEOF - -- ;; --esac - fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } -+ -+ -+ if test x$HAVE_VSNPRINTF = xno; then -+ NEED_VSNPRINTF_TRUE= -+ NEED_VSNPRINTF_FALSE='#' - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+ NEED_VSNPRINTF_TRUE='#' -+ NEED_VSNPRINTF_FALSE= - fi - - --fi --if test -z "$ac_cv_path_PKG_CONFIG"; then -- ac_pt_PKG_CONFIG=$PKG_CONFIG -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : -+{ $as_echo "$as_me:$LINENO: checking for mmap" >&5 -+$as_echo_n "checking for mmap... " >&6; } -+if test "${ac_cv_func_mmap+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- case $ac_pt_PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define mmap to an innocuous variant, in case declares mmap. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define mmap innocuous_mmap - -- ;; --esac --fi --ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG --if test -n "$ac_pt_PKG_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 --$as_echo "$ac_pt_PKG_CONFIG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char mmap (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -- if test "x$ac_pt_PKG_CONFIG" = x; then -- PKG_CONFIG="" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef mmap -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char mmap (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_mmap || defined __stub___mmap -+choke me -+#endif -+ -+int -+main () -+{ -+return mmap (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -- PKG_CONFIG=$ac_pt_PKG_CONFIG -- fi -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_mmap=yes - else -- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_mmap=no - fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.9.0 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 --$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- PKG_CONFIG="" -- fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5 -+$as_echo "$ac_cv_func_mmap" >&6; } -+if test "x$ac_cv_func_mmap" = x""yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAS_MMAP 1 -+_ACEOF - - fi --for ac_prog in flex lex --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LEX+set}" = set; then : -+ -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -+$as_echo_n "checking for sqrt in -lm... " >&6; } -+if test "${ac_cv_lib_m_sqrt+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$LEX"; then -- ac_cv_prog_LEX="$LEX" # Let the user override the test. -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char sqrt (); -+int -+main () -+{ -+return sqrt (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_m_sqrt=yes - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_LEX="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_lib_m_sqrt=no - fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --LEX=$ac_cv_prog_LEX --if test -n "$LEX"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 --$as_echo "$LEX" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -+$as_echo "$ac_cv_lib_m_sqrt" >&6; } -+if test "x$ac_cv_lib_m_sqrt" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBM 1 -+_ACEOF - -+ LIBS="-lm $LIBS" - -- test -n "$LEX" && break --done --test -n "$LEX" || LEX=":" -+fi - --if test "x$LEX" != "x:"; then -- cat >conftest.l <<_ACEOF --%% --a { ECHO; } --b { REJECT; } --c { yymore (); } --d { yyless (1); } --e { yyless (input () != 0); } --f { unput (yytext[0]); } --. { BEGIN INITIAL; } --%% --#ifdef YYTEXT_POINTER --extern char *yytext; -+{ $as_echo "$as_me:$LINENO: checking for cbrt in -lm" >&5 -+$as_echo_n "checking for cbrt in -lm... " >&6; } -+if test "${ac_cv_lib_m_cbrt+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" - #endif -+char cbrt (); - int --main (void) -+main () - { -- return ! yylex () + ! yywrap (); -+return cbrt (); -+ ; -+ return 0; - } - _ACEOF --{ { ac_try="$LEX conftest.l" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$LEX conftest.l") 2>&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 --$as_echo_n "checking lex output file root... " >&6; } --if test "${ac_cv_prog_lex_root+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_m_cbrt=yes - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if test -f lex.yy.c; then -- ac_cv_prog_lex_root=lex.yy --elif test -f lexyy.c; then -- ac_cv_prog_lex_root=lexyy --else -- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 --fi -+ ac_cv_lib_m_cbrt=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 --$as_echo "$ac_cv_prog_lex_root" >&6; } --LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - --if test -z "${LEXLIB+set}"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 --$as_echo_n "checking lex library... " >&6; } --if test "${ac_cv_lib_lex+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cbrt" >&5 -+$as_echo "$ac_cv_lib_m_cbrt" >&6; } -+if test "x$ac_cv_lib_m_cbrt" = x""yes; then - -- ac_save_LIBS=$LIBS -- ac_cv_lib_lex='none needed' -- for ac_lib in '' -lfl -ll; do -- LIBS="$ac_lib $ac_save_LIBS" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --`cat $LEX_OUTPUT_ROOT.c` -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_CBRT 1 - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_lex=$ac_lib --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- test "$ac_cv_lib_lex" != 'none needed' && break -- done -- LIBS=$ac_save_LIBS - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 --$as_echo "$ac_cv_lib_lex" >&6; } -- test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex --fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 --$as_echo_n "checking whether yytext is a pointer... " >&6; } --if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : -+ -+ -+ -+for ac_header in ndbm.h dbm.h rpcsvc/dbm.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- # POSIX says lex can declare yytext either as a pointer or an array; the --# default is implementation-dependent. Figure out which it is, since --# not all implementations provide the %pointer and %array declarations. --ac_cv_prog_lex_yytext_pointer=no --ac_save_LIBS=$LIBS --LIBS="$LEXLIB $ac_save_LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#define YYTEXT_POINTER 1 --`cat $LEX_OUTPUT_ROOT.c` -+$ac_includes_default -+#include <$ac_header> - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_prog_lex_yytext_pointer=yes --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_save_LIBS -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 --$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } --if test $ac_cv_prog_lex_yytext_pointer = yes; then - --$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - --fi --rm -f conftest.l $LEX_OUTPUT_ROOT.c -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no - fi --for ac_prog in 'bison -y' byacc --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_YACC+set}" = set; then : -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$YACC"; then -- ac_cv_prog_YACC="$YACC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_YACC="$ac_prog" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- --fi -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --YACC=$ac_cv_prog_YACC --if test -n "$YACC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 --$as_echo "$YACC" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ - fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - -+fi - -- test -n "$YACC" && break - done --test -n "$YACC" || YACC="yacc" - --# Check whether --enable-largefile was given. --if test "${enable_largefile+set}" = set; then : -- enableval=$enable_largefile; --fi - --if test "$enable_largefile" != no; then - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 --$as_echo_n "checking for special C compiler options needed for large files... " >&6; } --if test "${ac_cv_sys_largefile_CC+set}" = set; then : -+ -+ -+for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- ac_cv_sys_largefile_CC=no -- if test "$GCC" != yes; then -- ac_save_CC=$CC -- while :; do -- # IRIX 6.2 and later do not support large files by default, -- # so use the C compiler's -n32 option if that helps. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -- -- ; -- return 0; --} -+$ac_includes_default -+#include <$ac_header> - _ACEOF -- if ac_fn_c_try_compile "$LINENO"; then : -- break --fi --rm -f core conftest.err conftest.$ac_objext -- CC="$CC -n32" -- if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_sys_largefile_CC=' -n32'; break -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --rm -f core conftest.err conftest.$ac_objext -- break -- done -- CC=$ac_save_CC -- rm -f conftest.$ac_ext -- fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 --$as_echo "$ac_cv_sys_largefile_CC" >&6; } -- if test "$ac_cv_sys_largefile_CC" != no; then -- CC=$CC$ac_cv_sys_largefile_CC -- fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 --$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } --if test "${ac_cv_sys_file_offset_bits+set}" = set; then : -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- while :; do -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_sys_file_offset_bits=no; break -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#define _FILE_OFFSET_BITS 64 --#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- ; -- return 0; --} -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_sys_file_offset_bits=64; break -+ AGP=yes - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cv_sys_file_offset_bits=unknown -- break -+ - done -+ -+ if test "x$AGP" = xyes; then -+ AGP_TRUE= -+ AGP_FALSE='#' -+else -+ AGP_TRUE='#' -+ AGP_FALSE= - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 --$as_echo "$ac_cv_sys_file_offset_bits" >&6; } --case $ac_cv_sys_file_offset_bits in #( -- no | unknown) ;; -- *) --cat >>confdefs.h <<_ACEOF --#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits --_ACEOF --;; --esac --rm -rf conftest* -- if test $ac_cv_sys_file_offset_bits = unknown; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 --$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } --if test "${ac_cv_sys_large_files+set}" = set; then : -+ -+ -+ -+for ac_header in linux/apm_bios.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- while :; do -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -- -- ; -- return 0; --} -+$ac_includes_default -+#include <$ac_header> - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_sys_large_files=no; break -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#define _LARGE_FILES 1 --#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- ; -- return 0; --} -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_sys_large_files=1; break --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cv_sys_large_files=unknown -- break --done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 --$as_echo "$ac_cv_sys_large_files" >&6; } --case $ac_cv_sys_large_files in #( -- no | unknown) ;; -- *) --cat >>confdefs.h <<_ACEOF --#define _LARGE_FILES $ac_cv_sys_large_files -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> - _ACEOF --;; -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --rm -rf conftest* -- fi --fi -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --for ac_prog in cpp --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_RAWCPP+set}" = set; then : -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- case $RAWCPP in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" --for as_dir in $as_dummy --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- ;; --esac - fi --RAWCPP=$ac_cv_path_RAWCPP --if test -n "$RAWCPP"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 --$as_echo "$RAWCPP" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ LNXAPM=yes - fi - -- -- test -n "$RAWCPP" && break - done --test -n "$RAWCPP" || RAWCPP="${CPP}" -+ -+ if test "x$LNXAPM" = xyes; then -+ LNXAPM_TRUE= -+ LNXAPM_FALSE='#' -+else -+ LNXAPM_TRUE='#' -+ LNXAPM_FALSE= -+fi - - --# Check for flag to avoid builtin definitions - assumes unix is predefined, --# which is not the best choice for supporting other OS'es, but covers most --# of the ones we need for now. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 --$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ -+for ac_header in linux/fb.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --Does cpp redefine unix ? -+$ac_includes_default -+#include <$ac_header> - _ACEOF --if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --else -- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- RAWCPPFLAGS=-undef -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- # under Cygwin unix is still defined even with -undef -- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- RAWCPPFLAGS="-undef -ansi" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 --$as_echo "yes, with -ansi" >&6; } -- else -- as_fn_error "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5 -- fi -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --rm -f conftest.$ac_ext - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5 --$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --Does cpp preserve "whitespace"? -+#include <$ac_header> - _ACEOF --if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- as_fn_error "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5 -- fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi --rm -f conftest.$ac_ext - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --# Extract the first word of "sed", so it can be a program name with args. --set dummy sed; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_SED+set}" = set; then : -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- case $SED in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_SED="$SED" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- ;; --esac - fi --SED=$ac_cv_path_SED --if test -n "$SED"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 --$as_echo "$SED" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ FBDEV=yes -+fi -+ -+done -+ -+ if test "x$FBDEV" = xyes; then -+ FBDEVHW_TRUE= -+ FBDEVHW_FALSE='#' - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+ FBDEVHW_TRUE='#' -+ FBDEVHW_FALSE= - fi - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 --$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } --if test "${ac_cv_prog_cc_c99+set}" = set; then : -+for ac_header in asm/mtrr.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- ac_cv_prog_cc_c99=no --ac_save_CC=$CC --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include --#include --#include --#include --#include -- --// Check varargs macros. These examples are taken from C99 6.10.3.5. --#define debug(...) fprintf (stderr, __VA_ARGS__) --#define showlist(...) puts (#__VA_ARGS__) --#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) --static void --test_varargs_macros (void) --{ -- int x = 1234; -- int y = 5678; -- debug ("Flag"); -- debug ("X = %d\n", x); -- showlist (The first, second, and third items.); -- report (x>y, "x is %d but y is %d", x, y); --} -- --// Check long long types. --#define BIG64 18446744073709551615ull --#define BIG32 4294967295ul --#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) --#if !BIG_OK -- your preprocessor is broken; --#endif --#if BIG_OK --#else -- your preprocessor is broken; --#endif --static long long int bignum = -9223372036854775807LL; --static unsigned long long int ubignum = BIG64; -- --struct incomplete_array --{ -- int datasize; -- double data[]; --}; -- --struct named_init { -- int number; -- const wchar_t *name; -- double average; --}; -- --typedef const char *ccp; -- --static inline int --test_restrict (ccp restrict text) --{ -- // See if C++-style comments work. -- // Iterate through items via the restricted pointer. -- // Also check for declarations in for loops. -- for (unsigned int i = 0; *(text+i) != '\0'; ++i) -- continue; -- return 0; --} -- --// Check varargs and va_copy. --static void --test_varargs (const char *format, ...) --{ -- va_list args; -- va_start (args, format); -- va_list args_copy; -- va_copy (args_copy, args); -- -- const char *str; -- int number; -- float fnumber; -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- while (*format) -- { -- switch (*format++) -- { -- case 's': // string -- str = va_arg (args_copy, const char *); -- break; -- case 'd': // int -- number = va_arg (args_copy, int); -- break; -- case 'f': // float -- fnumber = va_arg (args_copy, double); -- break; -- default: -- break; -- } -- } -- va_end (args_copy); -- va_end (args); --} -+ ac_header_compiler=no -+fi - --int --main () --{ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- // Check bool. -- _Bool success = false; -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- // Check restrict. -- if (test_restrict ("String literal") == 0) -- success = true; -- char *restrict newvar = "Another string"; -+ ac_header_preproc=no -+fi - -- // Check varargs. -- test_varargs ("s, d' f .", "string", 65, 34.234); -- test_varargs_macros (); -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -- // Check flexible array members. -- struct incomplete_array *ia = -- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); -- ia->datasize = 10; -- for (int i = 0; i < ia->datasize; ++i) -- ia->data[i] = i * 1.234; -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- // Check named initializers. -- struct named_init ni = { -- .number = 34, -- .name = L"Test wide string", -- .average = 543.34343, -- }; -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ ac_cv_asm_mtrr_h=yes -+fi - -- ni.number = 58; -+done - -- int dynamic_array[ni.number]; -- dynamic_array[ni.number - 1] = 543; -+if test "x$ac_cv_asm_mtrr_h" = xyes; then -+ HAVE_MTRR=yes -+fi - -- // work around unused variable warnings -- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' -- || dynamic_array[ni.number - 1] != 543); - -- ; -- return 0; --} --_ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 -+for ac_header in sys/memrange.h - do -- CC="$ac_save_CC $ac_arg" -- if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_prog_cc_c99=$ac_arg --fi --rm -f core conftest.err conftest.$ac_objext -- test "x$ac_cv_prog_cc_c99" != "xno" && break --done --rm -f conftest.$ac_ext --CC=$ac_save_CC -- -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - fi --# AC_CACHE_VAL --case "x$ac_cv_prog_cc_c99" in -- x) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 --$as_echo "none needed" >&6; } ;; -- xno) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 --$as_echo "unsupported" >&6; } ;; -- *) -- CC="$CC $ac_cv_prog_cc_c99" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 --$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --if test "x$ac_cv_prog_cc_c99" != xno; then : -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --if test "x$GCC" = xyes ; then -- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ ---Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ ---Wbad-function-cast" -- case `$CC -dumpversion` in -- 3.4.* | 4.*) -- CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" -- ;; -- esac --else -- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" --if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : -- SUNCC="yes" -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- SUNCC="no" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- if test "x$SUNCC" = "xyes"; then -- CWARNFLAGS="-v" -- fi - fi -- --# Check whether --enable-silent-rules was given. --if test "${enable_silent_rules+set}" = set; then : -- enableval=$enable_silent_rules; -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ ac_cv_memrange_h=yes - fi - --case $enable_silent_rules in --yes) AM_DEFAULT_VERBOSITY=0;; --no) AM_DEFAULT_VERBOSITY=1;; --*) AM_DEFAULT_VERBOSITY=0;; --esac --AM_BACKSLASH='\' -- -+done - -+if test "x$ac_cv_memrange_h" = xyes; then -+ HAVE_MTRR=yes -+fi - -+if test "x$HAVE_MTRR" = xyes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_MTRR_SUPPORT 1 -+_ACEOF - -+fi - - --# Check whether --enable-strict-compilation was given. --if test "${enable_strict_compilation+set}" = set; then : -- enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -+for ac_header in machine/mtrr.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- STRICT_COMPILE=no -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi - --if test "x$STRICT_COMPILE" = "xyes"; then -- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" --if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : -- SUNCC="yes" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- SUNCC="no" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi - -- ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" --if test "x$ac_cv_have_decl___INTEL_COMPILER" = x""yes; then : -- INTELCC="yes" -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- INTELCC="no" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- if test "x$GCC" = xyes ; then -- STRICT_CFLAGS="-pedantic -Werror" -- elif test "x$SUNCC" = "xyes"; then -- STRICT_CFLAGS="-errwarn" -- elif test "x$INTELCC" = "xyes"; then -- STRICT_CFLAGS="-Werror" -- fi - fi --CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ ac_cv_machine_mtrr_h=yes -+fi - -+done - -+if test "x$ac_cv_machine_mtrr_h" = xyes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_MTRR_BUILTIN 1 -+_ACEOF - --# Check whether --with-release-version was given. --if test "${with_release_version+set}" = set; then : -- withval=$with_release_version; RELEASE_VERSION="$withval" --else -- RELEASE_VERSION="" - fi - -- if test "x$RELEASE_VERSION" != "x"; then -- PACKAGE="$PACKAGE-$RELEASE_VERSION" -- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -- { $as_echo "$as_me:${as_lineno-$LINENO}: Building with package name set to $PACKAGE" >&5 --$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} -- fi - --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` -+for ac_header in sys/linker.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include - -- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` -- if test "x$PVM" = "x"; then -- PVM="0" -- fi -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION_MINOR $PVM -+#include <$ac_header> - _ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` -- if test "x$PVP" = "x"; then -- PVP="0" -- fi -+ eval "$as_ac_Header=no" -+fi - --cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION_PATCHLEVEL $PVP -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -+ ac_cv_sys_linker_h=yes -+else -+ ac_cv_sys_linker_h=no -+fi - -+done - -- --CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ --mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ --echo 'git directory not found: installing possibly empty changelog.' >&2)" -- --distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' -- -+ if test "x$ac_cv_sys_linker_h" = xyes; then -+ FREEBSD_KLDLOAD_TRUE= -+ FREEBSD_KLDLOAD_FALSE='#' -+else -+ FREEBSD_KLDLOAD_TRUE='#' -+ FREEBSD_KLDLOAD_FALSE= -+fi - - -+{ $as_echo "$as_me:$LINENO: checking for SYSV IPC" >&5 -+$as_echo_n "checking for SYSV IPC... " >&6; } -+if test "${ac_cv_sysv_ipc+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+#include -+#include -+#include - --if test x$APP_MAN_SUFFIX = x ; then -- APP_MAN_SUFFIX=1 --fi --if test x$APP_MAN_DIR = x ; then -- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' --fi -+int -+main () -+{ - --if test x$LIB_MAN_SUFFIX = x ; then -- LIB_MAN_SUFFIX=3 --fi --if test x$LIB_MAN_DIR = x ; then -- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' --fi -+{ -+ int id; -+ id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); -+ if (id < 0) return -1; -+ return shmctl(id, IPC_RMID, 0); -+} -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_sysv_ipc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if test x$FILE_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) FILE_MAN_SUFFIX=4 ;; -- *) FILE_MAN_SUFFIX=5 ;; -- esac --fi --if test x$FILE_MAN_DIR = x ; then -- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -+ ac_cv_sysv_ipc=no - fi - --if test x$MISC_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) MISC_MAN_SUFFIX=5 ;; -- *) MISC_MAN_SUFFIX=7 ;; -- esac --fi --if test x$MISC_MAN_DIR = x ; then -- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sysv_ipc" >&5 -+$as_echo "$ac_cv_sysv_ipc" >&6; } -+if test "x$ac_cv_sysv_ipc" = xyes; then - --if test x$DRIVER_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) DRIVER_MAN_SUFFIX=7 ;; -- *) DRIVER_MAN_SUFFIX=4 ;; -- esac --fi --if test x$DRIVER_MAN_DIR = x ; then -- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SYSV_IPC 1 -+_ACEOF - --if test x$ADMIN_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) ADMIN_MAN_SUFFIX=1m ;; -- *) ADMIN_MAN_SUFFIX=8 ;; -- esac --fi --if test x$ADMIN_MAN_DIR = x ; then -- ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' - fi - -+if test -c /dev/xf86 ; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAS_APERTURE_DRV 1 -+_ACEOF - -+fi - -+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5 -+$as_echo_n "checking for machine/apmvar.h... " >&6; } -+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5 -+$as_echo "$ac_cv_header_machine_apmvar_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h usability" >&5 -+$as_echo_n "checking machine/apmvar.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h presence" >&5 -+$as_echo_n "checking machine/apmvar.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5 -+$as_echo_n "checking for machine/apmvar.h... " >&6; } -+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_header_machine_apmvar_h=$ac_header_preproc -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5 -+$as_echo "$ac_cv_header_machine_apmvar_h" >&6; } - -+fi -+if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then - -+ if test "${ac_cv_header_sys_event_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5 -+$as_echo_n "checking for sys/event.h... " >&6; } -+if test "${ac_cv_header_sys_event_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5 -+$as_echo "$ac_cv_header_sys_event_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking sys/event.h usability" >&5 -+$as_echo_n "checking sys/event.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- --# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow --# easier overrides at build time. --XSERVER_CFLAGS='$(CWARNFLAGS)' -- -- --# Check whether --with-dtrace was given. --if test "${with_dtrace+set}" = set; then : -- withval=$with_dtrace; WDTRACE=$withval -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking sys/event.h presence" >&5 -+$as_echo_n "checking sys/event.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- WDTRACE=auto -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi - --if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then -- # Extract the first word of "dtrace", so it can be a program name with args. --set dummy dtrace; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_DTRACE+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $DTRACE in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --as_dummy="$PATH:/usr/sbin" --for as_dir in $as_dummy --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -- test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not_found" -- ;; -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: sys/event.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac --fi --DTRACE=$ac_cv_path_DTRACE --if test -n "$DTRACE"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 --$as_echo "$DTRACE" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5 -+$as_echo_n "checking for sys/event.h... " >&6; } -+if test "${ac_cv_header_sys_event_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+ ac_cv_header_sys_event_h=$ac_header_preproc - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5 -+$as_echo "$ac_cv_header_sys_event_h" >&6; } - -- -- if test "x$DTRACE" = "xnot_found" ; then -- if test "x$WDTRACE" = "xyes" ; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "dtrace requested but not found --See \`config.log' for more details." "$LINENO" 5; } -- fi -- WDTRACE="no" -- else -- ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_sdt_h" = x""yes; then : -- HAS_SDT_H="yes" -+fi -+if test "x$ac_cv_header_sys_event_h" = x""yes; then -+ ac_cv_BSD_KQUEUE_APM=yes - else -- HAS_SDT_H="no" -+ ac_cv_BSD_APM=yes - fi - - -- if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then -- WDTRACE="no" -- fi -- fi - fi --if test "x$WDTRACE" != "xno" ; then - --$as_echo "#define XSERVER_DTRACE 1" >>confdefs.h - - --# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into --# object files, and require linking with those as relocatable objects, not .a --# archives. MacOS X handles all this in the normal compiler toolchain, and on --# some releases (like Tiger), will error out on dtrace -G. For now, other --# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux --# ports appear to, based on my web searches, but have not yet been tested). -- case $host_os in -- darwin*) SPECIAL_DTRACE_OBJECTS=no ;; -- *) SPECIAL_DTRACE_OBJECTS=yes ;; -- esac --fi -- if test "x$WDTRACE" != "xno"; then -- XSERVER_DTRACE_TRUE= -- XSERVER_DTRACE_FALSE='#' -+ if test "x$ac_cv_BSD_APM" = xyes; then -+ BSD_APM_TRUE= -+ BSD_APM_FALSE='#' - else -- XSERVER_DTRACE_TRUE='#' -- XSERVER_DTRACE_FALSE= -+ BSD_APM_TRUE='#' -+ BSD_APM_FALSE= - fi - -- if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"; then -- SPECIAL_DTRACE_OBJECTS_TRUE= -- SPECIAL_DTRACE_OBJECTS_FALSE='#' -+ if test "x$ac_cv_BSD_KQUEUE_APM" = xyes; then -+ BSD_KQUEUE_APM_TRUE= -+ BSD_KQUEUE_APM_FALSE='#' - else -- SPECIAL_DTRACE_OBJECTS_TRUE='#' -- SPECIAL_DTRACE_OBJECTS_FALSE= -+ BSD_KQUEUE_APM_TRUE='#' -+ BSD_KQUEUE_APM_FALSE= - fi - - --ac_header_dirent=no --for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 --$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : -+if test "${ac_cv_header_execinfo_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5 -+$as_echo_n "checking for execinfo.h... " >&6; } -+if test "${ac_cv_header_execinfo_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -+$as_echo "$ac_cv_header_execinfo_h" >&6; } - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking execinfo.h usability" >&5 -+$as_echo_n "checking execinfo.h usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include --#include <$ac_hdr> -- --int --main () --{ --if ((DIR *) 0) --return 0; -- ; -- return 0; --} -+$ac_includes_default -+#include - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval "$as_ac_Header=yes" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- eval "$as_ac_Header=no" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --eval ac_res=\$$as_ac_Header -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking execinfo.h presence" >&5 -+$as_echo_n "checking execinfo.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include - _ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_dirent=$ac_hdr; break -+ ac_header_preproc=no - fi - --done --# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. --if test $ac_header_dirent = dirent.h; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 --$as_echo_n "checking for library containing opendir... " >&6; } --if test "${ac_cv_search_opendir+set}" = set; then : -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5 -+$as_echo_n "checking for execinfo.h... " >&6; } -+if test "${ac_cv_header_execinfo_h+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_func_search_save_LIBS=$LIBS --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ ac_cv_header_execinfo_h=$ac_header_preproc -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -+$as_echo "$ac_cv_header_execinfo_h" >&6; } -+ -+fi -+if test "x$ac_cv_header_execinfo_h" = x""yes; then -+ -+ { $as_echo "$as_me:$LINENO: checking for backtrace in -lc" >&5 -+$as_echo_n "checking for backtrace in -lc... " >&6; } -+if test "${ac_cv_lib_c_backtrace+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lc $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -13394,1108 +19731,1313 @@ - #ifdef __cplusplus - extern "C" - #endif --char opendir (); -+char backtrace (); - int - main () - { --return opendir (); -+return backtrace (); - ; - return 0; - } - _ACEOF --for ac_lib in '' dir; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_opendir=$ac_res -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_c_backtrace=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_c_backtrace=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if test "${ac_cv_search_opendir+set}" = set; then : -- break -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --done --if test "${ac_cv_search_opendir+set}" = set; then : -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_backtrace" >&5 -+$as_echo "$ac_cv_lib_c_backtrace" >&6; } -+if test "x$ac_cv_lib_c_backtrace" = x""yes; then -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_BACKTRACE 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_EXECINFO_H 1 -+_ACEOF -+ -+ -+fi -+ -+ -+fi -+ -+ -+ -+DEFAULT_INT10="x86emu" -+ -+ -+case $host_cpu in -+ alpha*) -+ ALPHA_VIDEO=yes -+ case $host_os in -+ *freebsd*) SYS_LIBS=-lio ;; -+ *netbsd*) -+cat >>confdefs.h <<\_ACEOF -+#define USE_ALPHA_PIO 1 -+_ACEOF -+ ;; -+ esac -+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" -+ ;; -+ arm*) -+ ARM_VIDEO=yes -+ ;; -+ i*86) -+ I386_VIDEO=yes -+ case $host_os in -+ *freebsd*) cat >>confdefs.h <<\_ACEOF -+#define USE_DEV_IO 1 -+_ACEOF -+ ;; -+ *dragonfly*) cat >>confdefs.h <<\_ACEOF -+#define USE_DEV_IO 1 -+_ACEOF -+ ;; -+ *netbsd*) cat >>confdefs.h <<\_ACEOF -+#define USE_I386_IOPL 1 -+_ACEOF -+ -+ SYS_LIBS=-li386 -+ ;; -+ *openbsd*) cat >>confdefs.h <<\_ACEOF -+#define USE_I386_IOPL 1 -+_ACEOF -+ -+ SYS_LIBS=-li386 -+ ;; -+ esac -+ ;; -+ powerpc*) -+ PPC_VIDEO=yes -+ case $host_os in -+ *freebsd*) DEFAULT_INT10=stub ;; -+ esac -+ ;; -+ sparc*) -+ SPARC64_VIDEO=yes -+ BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" -+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -+ ;; -+ x86_64*|amd64*) -+ I386_VIDEO=yes -+ case $host_os in -+ *freebsd*) -+cat >>confdefs.h <<\_ACEOF -+#define USE_DEV_IO 1 -+_ACEOF -+ ;; -+ *dragonfly*) -+cat >>confdefs.h <<\_ACEOF -+#define USE_DEV_IO 1 -+_ACEOF -+ ;; -+ *netbsd*) -+cat >>confdefs.h <<\_ACEOF -+#define USE_I386_IOPL 1 -+_ACEOF -+ -+ SYS_LIBS=-lx86_64 -+ ;; -+ *openbsd*) -+cat >>confdefs.h <<\_ACEOF -+#define USE_AMD64_IOPL 1 -+_ACEOF - --else -- ac_cv_search_opendir=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 --$as_echo "$ac_cv_search_opendir" >&6; } --ac_res=$ac_cv_search_opendir --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ SYS_LIBS=-lamd64 -+ ;; -+ esac -+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -+ ;; -+ ia64*) -+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -+ ;; -+ s390*) -+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -+ ;; -+esac - --fi - -+ if test "x$ALPHA_VIDEO" = xyes; then -+ ALPHA_VIDEO_TRUE= -+ ALPHA_VIDEO_FALSE='#' - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 --$as_echo_n "checking for library containing opendir... " >&6; } --if test "${ac_cv_search_opendir+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char opendir (); --int --main () --{ --return opendir (); -- ; -- return 0; --} --_ACEOF --for ac_lib in '' x; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_opendir=$ac_res --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if test "${ac_cv_search_opendir+set}" = set; then : -- break -+ ALPHA_VIDEO_TRUE='#' -+ ALPHA_VIDEO_FALSE= - fi --done --if test "${ac_cv_search_opendir+set}" = set; then : - -+ if test "x$ARM_VIDEO" = xyes; then -+ ARM_VIDEO_TRUE= -+ ARM_VIDEO_FALSE='#' - else -- ac_cv_search_opendir=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+ ARM_VIDEO_TRUE='#' -+ ARM_VIDEO_FALSE= - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 --$as_echo "$ac_cv_search_opendir" >&6; } --ac_res=$ac_cv_search_opendir --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+ if test "x$I386_VIDEO" = xyes; then -+ I386_VIDEO_TRUE= -+ I386_VIDEO_FALSE='#' -+else -+ I386_VIDEO_TRUE='#' -+ I386_VIDEO_FALSE= - fi - -+ if test "x$PPC_VIDEO" = xyes; then -+ PPC_VIDEO_TRUE= -+ PPC_VIDEO_FALSE='#' -+else -+ PPC_VIDEO_TRUE='#' -+ PPC_VIDEO_FALSE= - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 --$as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ if test "x$SPARC64_VIDEO" = xyes; then -+ SPARC64_VIDEO_TRUE= -+ SPARC64_VIDEO_FALSE='#' - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include --#include --#include -+ SPARC64_VIDEO_TRUE='#' -+ SPARC64_VIDEO_FALSE= -+fi - --int --main () --{ - -- ; -- return 0; --} -+DRI=no -+USE_SIGIO_BY_DEFAULT="yes" -+case $host_os in -+ *freebsd* | *dragonfly*) -+ case $host_os in -+ kfreebsd*-gnu) ;; -+ *) -+cat >>confdefs.h <<\_ACEOF -+#define CSRG_BASED 1 - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_header_stdc=yes --else -- ac_cv_header_stdc=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -+ ;; -+ esac - -+cat >>confdefs.h <<\_ACEOF -+#define PCCONS_SUPPORT 1 - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then : - --else -- ac_cv_header_stdc=no --fi --rm -f conftest* - --fi -+cat >>confdefs.h <<\_ACEOF -+#define PCVT_SUPPORT 1 -+_ACEOF - --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include - -+cat >>confdefs.h <<\_ACEOF -+#define SYSCONS_SUPPORT 1 - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then : - --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+ DRI=yes -+ ;; -+ *netbsd*) - --fi -+cat >>confdefs.h <<\_ACEOF -+#define CSRG_BASED 1 -+_ACEOF - --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then : -- : --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif - --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- return 2; -- return 0; --} -+cat >>confdefs.h <<\_ACEOF -+#define PCCONS_SUPPORT 1 - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --else -- ac_cv_header_stdc=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - --fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } --if test $ac_cv_header_stdc = yes; then - --$as_echo "#define STDC_HEADERS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define PCVT_SUPPORT 1 -+_ACEOF - --fi - --for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+cat >>confdefs.h <<\_ACEOF -+#define WSCONS_SUPPORT 1 - _ACEOF - --fi -- --done -+ DRI=yes -+ ;; -+ *openbsd*) - -+cat >>confdefs.h <<\_ACEOF -+#define CSRG_BASED 1 -+_ACEOF - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 --$as_echo_n "checking for an ANSI C-conforming const... " >&6; } --if test "${ac_cv_c_const+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - --int --main () --{ --/* FIXME: Include the comments suggested by Paul. */ --#ifndef __cplusplus -- /* Ultrix mips cc rejects this. */ -- typedef int charset[2]; -- const charset cs; -- /* SunOS 4.1.1 cc rejects this. */ -- char const *const *pcpcc; -- char **ppc; -- /* NEC SVR4.0.2 mips cc rejects this. */ -- struct point {int x, y;}; -- static struct point const zero = {0,0}; -- /* AIX XL C 1.02.0.0 rejects this. -- It does not let you subtract one const X* pointer from another in -- an arm of an if-expression whose if-part is not a constant -- expression */ -- const char *g = "string"; -- pcpcc = &g + (g ? g-g : 0); -- /* HPUX 7.0 cc rejects these. */ -- ++pcpcc; -- ppc = (char**) pcpcc; -- pcpcc = (char const *const *) ppc; -- { /* SCO 3.2v4 cc rejects this. */ -- char *t; -- char const *s = 0 ? (char *) 0 : (char const *) 0; -+cat >>confdefs.h <<\_ACEOF -+#define PCVT_SUPPORT 1 -+_ACEOF - -- *t++ = 0; -- if (s) return 0; -- } -- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -- int x[] = {25, 17}; -- const int *foo = &x[0]; -- ++foo; -- } -- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -- typedef const int *iptr; -- iptr p = 0; -- ++p; -- } -- { /* AIX XL C 1.02.0.0 rejects this saying -- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -- } -- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -- const int foo = 10; -- if (!foo) return 0; -- } -- return !cs[0] && !zero.x; --#endif - -- ; -- return 0; --} -+cat >>confdefs.h <<\_ACEOF -+#define WSCONS_SUPPORT 1 - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_c_const=yes -+ -+ ;; -+ *linux*) -+ DRI=yes -+ ;; -+ *solaris*) -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ DRI=yes - else -- ac_cv_c_const=no -+ DRI=no - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ # Disable use of SIGIO by default until some system bugs are -+ # fixed - see Sun/OpenSolaris bug id 6879897 -+ USE_SIGIO_BY_DEFAULT="no" -+ ;; -+ darwin*) -+ -+cat >>confdefs.h <<\_ACEOF -+#define CSRG_BASED 1 -+_ACEOF -+ -+ ;; -+esac -+ -+PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` -+PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1` -+if test "x$PVS" = "x"; then -+ PVS="0" - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 --$as_echo "$ac_cv_c_const" >&6; } --if test $ac_cv_c_const = no; then - --$as_echo "#define const /**/" >>confdefs.h -+VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)" -+VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" -+ -+VENDOR_NAME="The X.Org Foundation" -+VENDOR_NAME_SHORT="X.Org" -+VENDOR_WEB="http://wiki.x.org" -+ - -+ -+# Check whether --enable-werror was given. -+if test "${enable_werror+set}" = set; then -+ enableval=$enable_werror; { { $as_echo "$as_me:$LINENO: error: --enable-werror has been replaced by --enable-strict-compilation" >&5 -+$as_echo "$as_me: error: --enable-werror has been replaced by --enable-strict-compilation" >&2;} -+ { (exit 1); exit 1; }; } - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 --$as_echo_n "checking whether byte ordering is bigendian... " >&6; } --if test "${ac_cv_c_bigendian+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ -+# Check whether --enable-debug was given. -+if test "${enable_debug+set}" = set; then -+ enableval=$enable_debug; DEBUGGING=$enableval - else -- ac_cv_c_bigendian=unknown -- # See if we're dealing with a universal compiler. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#ifndef __APPLE_CC__ -- not a universal capable compiler -- #endif -- typedef int dummy; -+ DEBUGGING=no -+fi - --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+# Check whether --enable-unit-tests was given. -+if test "${enable_unit_tests+set}" = set; then -+ enableval=$enable_unit_tests; UNITTESTS=$enableval -+else -+ UNITTESTS=auto -+fi - -- # Check for potential -arch flags. It is not universal unless -- # there are at least two -arch flags with different values. -- ac_arch= -- ac_prev= -- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do -- if test -n "$ac_prev"; then -- case $ac_word in -- i?86 | x86_64 | ppc | ppc64) -- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then -- ac_arch=$ac_word -- else -- ac_cv_c_bigendian=universal -- break -- fi -- ;; -- esac -- ac_prev= -- elif test "x$ac_word" = "x-arch"; then -- ac_prev=arch -- fi -- done -+# Check whether --enable-sigio-default was given. -+if test "${enable_sigio_default+set}" = set; then -+ enableval=$enable_sigio_default; USE_SIGIO_BY_DEFAULT=$enableval - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test $ac_cv_c_bigendian = unknown; then -- # See if sys/param.h defines the BYTE_ORDER macro. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -- #include - --int --main () --{ --#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ -- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ -- && LITTLE_ENDIAN) -- bogus endian macros -- #endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- # It does; now see whether it defined to BIG_ENDIAN or not. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -- #include -+# Check whether --with-int10 was given. -+if test "${with_int10+set}" = set; then -+ withval=$with_int10; INT10="$withval" -+else -+ INT10="$DEFAULT_INT10" -+fi - --int --main () --{ --#if BYTE_ORDER != BIG_ENDIAN -- not big endian -- #endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_c_bigendian=yes --else -- ac_cv_c_bigendian=no -+# Check whether --with-vendor-name was given. -+if test "${with_vendor_name+set}" = set; then -+ withval=$with_vendor_name; VENDOR_NAME="$withval" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ -+# Check whether --with-vendor-name-short was given. -+if test "${with_vendor_name_short+set}" = set; then -+ withval=$with_vendor_name_short; VENDOR_NAME_SHORT="$withval" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- fi -- if test $ac_cv_c_bigendian = unknown; then -- # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include - --int --main () --{ --#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) -- bogus endian macros -- #endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- # It does; now see whether it defined to _BIG_ENDIAN or not. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -+# Check whether --with-vendor-web was given. -+if test "${with_vendor_web+set}" = set; then -+ withval=$with_vendor_web; VENDOR_WEB="$withval" -+fi - --int --main () --{ --#ifndef _BIG_ENDIAN -- not big endian -- #endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_c_bigendian=yes -+# Check whether --with-module-dir was given. -+if test "${with_module_dir+set}" = set; then -+ withval=$with_module_dir; moduledir="$withval" - else -- ac_cv_c_bigendian=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ moduledir="${libdir}/xorg/modules" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- fi -- if test $ac_cv_c_bigendian = unknown; then -- # Compile a test program. -- if test "$cross_compiling" = yes; then : -- # Try to guess by grepping values from an object file. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --short int ascii_mm[] = -- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -- short int ascii_ii[] = -- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -- int use_ascii (int i) { -- return ascii_mm[i] + ascii_ii[i]; -- } -- short int ebcdic_ii[] = -- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -- short int ebcdic_mm[] = -- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -- int use_ebcdic (int i) { -- return ebcdic_mm[i] + ebcdic_ii[i]; -- } -- extern int foo; - --int --main () --{ --return use_ascii (foo) == use_ebcdic (foo); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then -- ac_cv_c_bigendian=yes -- fi -- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi -- fi -+ -+# Check whether --with-log-dir was given. -+if test "${with_log_dir+set}" = set; then -+ withval=$with_log_dir; logdir="$withval" -+else -+ logdir="$localstatedir/log" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ -+# Check whether --with-builder-addr was given. -+if test "${with_builder_addr+set}" = set; then -+ withval=$with_builder_addr; BUILDERADDR="$withval" - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ -+ BUILDERADDR="xorg@lists.freedesktop.org" -+fi - -- /* Are we little or big endian? From Harbison&Steele. */ -- union -- { -- long int l; -- char c[sizeof (long int)]; -- } u; -- u.l = 1; -- return u.c[sizeof (long int) - 1] == 1; - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ac_cv_c_bigendian=no -+# Check whether --with-os-name was given. -+if test "${with_os_name+set}" = set; then -+ withval=$with_os_name; OSNAME="$withval" - else -- ac_cv_c_bigendian=yes -+ OSNAME=`uname -srm` - fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ -+ -+# Check whether --with-os-vendor was given. -+if test "${with_os_vendor+set}" = set; then -+ withval=$with_os_vendor; OSVENDOR="$withval" -+else -+ OSVENDOR="" - fi - -- fi -+ -+# Check whether --with-builderstring was given. -+if test "${with_builderstring+set}" = set; then -+ withval=$with_builderstring; BUILDERSTRING="$withval" -+ - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 --$as_echo "$ac_cv_c_bigendian" >&6; } -- case $ac_cv_c_bigendian in #( -- yes) -- ENDIAN="X_BIG_ENDIAN";; #( -- no) -- ENDIAN="X_LITTLE_ENDIAN" ;; #( -- universal) - --$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - -- ;; #( -- *) -- as_fn_error "unknown endianness -- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; -- esac -+# Check whether --with-fontdir was given. -+if test "${with_fontdir+set}" = set; then -+ withval=$with_fontdir; FONTDIR="$withval" -+else -+ FONTDIR="${libdir}/X11/fonts" -+fi - -+DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" -+case $host_os in -+ darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -+esac - --# The cast to long int works around a bug in the HP C Compiler --# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. --# This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 --$as_echo_n "checking size of unsigned long... " >&6; } --if test "${ac_cv_sizeof_unsigned_long+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+# Check whether --with-default-font-path was given. -+if test "${with_default_font_path+set}" = set; then -+ withval=$with_default_font_path; FONTPATH="$withval" - else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : -+ FONTPATH="${DEFAULT_FONT_PATH}" -+fi -+ - -+ -+# Check whether --with-xkb-path was given. -+if test "${with_xkb_path+set}" = set; then -+ withval=$with_xkb_path; XKBPATH="$withval" - else -- if test "$ac_cv_type_unsigned_long" = yes; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned long) --See \`config.log' for more details." "$LINENO" 5; }; } -- else -- ac_cv_sizeof_unsigned_long=0 -- fi -+ XKBPATH="${datadir}/X11/xkb" - fi - -+ -+# Check whether --with-xkb-output was given. -+if test "${with_xkb_output+set}" = set; then -+ withval=$with_xkb_output; XKBOUTPUT="$withval" -+else -+ XKBOUTPUT="${localstatedir}/cache/xkb" - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 --$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } - - -+# Check whether --with-default-xkb-rules was given. -+if test "${with_default_xkb_rules+set}" = set; then -+ withval=$with_default_xkb_rules; XKB_DFLT_RULES="$withval" -+else -+ XKB_DFLT_RULES="" -+fi - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long --_ACEOF -+ -+# Check whether --with-default-xkb-model was given. -+if test "${with_default_xkb_model+set}" = set; then -+ withval=$with_default_xkb_model; XKB_DFLT_MODEL="$withval" -+else -+ XKB_DFLT_MODEL="pc104" -+fi - - --if test "$ac_cv_sizeof_unsigned_long" = 8; then -+# Check whether --with-default-xkb-layout was given. -+if test "${with_default_xkb_layout+set}" = set; then -+ withval=$with_default_xkb_layout; XKB_DFLT_LAYOUT="$withval" -+else -+ XKB_DFLT_LAYOUT="us" -+fi - --$as_echo "#define _XSERVER64 1" >>confdefs.h - -+# Check whether --with-default-xkb-variant was given. -+if test "${with_default_xkb_variant+set}" = set; then -+ withval=$with_default_xkb_variant; XKB_DFLT_VARIANT="$withval" -+else -+ XKB_DFLT_VARIANT="" - fi - --ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" --if test "x$ac_cv_type_pid_t" = x""yes; then : - -+# Check whether --with-default-xkb-options was given. -+if test "${with_default_xkb_options+set}" = set; then -+ withval=$with_default_xkb_options; XKB_DFLT_OPTIONS="$withval" - else -+ XKB_DFLT_OPTIONS="" -+fi - --cat >>confdefs.h <<_ACEOF --#define pid_t int --_ACEOF - -+# Check whether --with-serverconfig-path was given. -+if test "${with_serverconfig_path+set}" = set; then -+ withval=$with_serverconfig_path; SERVERCONFIG="$withval" -+else -+ SERVERCONFIG="${libdir}/xorg" - fi - - --# Checks for headers/macros for byte swapping --# Known variants: --# bswap_16, bswap_32, bswap_64 (glibc) --# __swap16, __swap32, __swap64 (OpenBSD) --# bswap16, bswap32, bswap64 (other BSD's) --# and a fallback to local macros if none of the above are found -+# Check whether --with-apple-applications-dir was given. -+if test "${with_apple_applications_dir+set}" = set; then -+ withval=$with_apple_applications_dir; APPLE_APPLICATIONS_DIR="${withval}" -+else -+ APPLE_APPLICATIONS_DIR="/Applications/Utilities" -+fi -+ - --# if is found, assume it's the correct version --for ac_header in byteswap.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" --if test "x$ac_cv_header_byteswap_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_BYTESWAP_H 1 --_ACEOF - -+# Check whether --with-apple-application-name was given. -+if test "${with_apple_application_name+set}" = set; then -+ withval=$with_apple_application_name; APPLE_APPLICATION_NAME="${withval}" -+else -+ APPLE_APPLICATION_NAME="X11" - fi - --done - - --# if is found, have to check which version --ac_fn_c_check_header_mongrel "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_endian_h" = x""yes; then : -- HAVE_SYS_ENDIAN_H="yes" -+# Check whether --with-launchd-id-prefix was given. -+if test "${with_launchd_id_prefix+set}" = set; then -+ withval=$with_launchd_id_prefix; LAUNCHD_ID_PREFIX="${withval}" - else -- HAVE_SYS_ENDIAN_H="no" -+ LAUNCHD_ID_PREFIX="org.x" - fi - - - --if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of byteswapping macros" >&5 --$as_echo_n "checking for __swap16 variant of byteswapping macros... " >&6; } -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+cat >>confdefs.h <<_ACEOF -+#define LAUNCHD_ID_PREFIX "$LAUNCHD_ID_PREFIX" -+_ACEOF - --#include --#include -+# Check whether --enable-sparkle was given. -+if test "${enable_sparkle+set}" = set; then -+ enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" -+else -+ XQUARTZ_SPARKLE="no" -+fi - --int --main () --{ - --int a = 1, b; --b = __swap16(a); -+# Check whether --enable-builddocs was given. -+if test "${enable_builddocs+set}" = set; then -+ enableval=$enable_builddocs; BUILDDOCS=$enableval -+else -+ BUILDDOCS=no -+fi - -- ; -- return 0; --} -+# Check whether --enable-install-libxf86config was given. -+if test "${enable_install_libxf86config+set}" = set; then -+ enableval=$enable_install_libxf86config; INSTALL_LIBXF86CONFIG=$enableval -+else -+ INSTALL_LIBXF86CONFIG=no -+fi - --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- SYS_ENDIAN__SWAP='yes' -+# Check whether --enable-null-root-cursor was given. -+if test "${enable_null_root_cursor+set}" = set; then -+ enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval - else -- SYS_ENDIAN__SWAP='no' -+ NULL_ROOT_CURSOR=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN__SWAP" >&5 --$as_echo "$SYS_ENDIAN__SWAP" >&6; } - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of byteswapping macros" >&5 --$as_echo_n "checking for bswap16 variant of byteswapping macros... " >&6; } -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+# Check whether --enable-visibility was given. -+if test "${enable_visibility+set}" = set; then -+ enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval -+else -+ SYMBOL_VISIBILITY=auto -+fi - --#include --#include - --int --main () --{ - --int a = 1, b; --b = bswap16(a); -+# Check whether --with-dri-driver-path was given. -+if test "${with_dri_driver_path+set}" = set; then -+ withval=$with_dri_driver_path; DRI_DRIVER_PATH="$withval" -+else -+ DRI_DRIVER_PATH="${libdir}/dri" -+fi - -- ; -- return 0; --} -+# Check whether --enable-aiglx was given. -+if test "${enable_aiglx+set}" = set; then -+ enableval=$enable_aiglx; AIGLX=$enableval -+else -+ AIGLX=yes -+fi - --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- SYS_ENDIAN_BSWAP='yes' -+# Check whether --enable-glx-tls was given. -+if test "${enable_glx_tls+set}" = set; then -+ enableval=$enable_glx_tls; GLX_USE_TLS=$enableval - else -- SYS_ENDIAN_BSWAP='no' -+ GLX_USE_TLS=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN_BSWAP" >&5 --$as_echo "$SYS_ENDIAN_BSWAP" >&6; } - -- if test "$SYS_ENDIAN_BSWAP" = "yes" ; then -- USE_SYS_ENDIAN_H=yes -- BSWAP=bswap -- else -- if test "$SYS_ENDIAN__SWAP" = "yes" ; then -- USE_SYS_ENDIAN_H=yes -- BSWAP=__swap -- else -- USE_SYS_ENDIAN_H=no -- fi -- fi - -- if test "$USE_SYS_ENDIAN_H" = "yes" ; then -+# Check whether --enable-registry was given. -+if test "${enable_registry+set}" = set; then -+ enableval=$enable_registry; XREGISTRY=$enableval -+else -+ XREGISTRY=yes -+fi - --$as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h -+# Check whether --enable-composite was given. -+if test "${enable_composite+set}" = set; then -+ enableval=$enable_composite; COMPOSITE=$enableval -+else -+ COMPOSITE=yes -+fi - -+# Check whether --enable-mitshm was given. -+if test "${enable_mitshm+set}" = set; then -+ enableval=$enable_mitshm; MITSHM=$enableval -+else -+ MITSHM=yes -+fi - --cat >>confdefs.h <<_ACEOF --#define bswap_16 ${BSWAP}16 --_ACEOF -+# Check whether --enable-xres was given. -+if test "${enable_xres+set}" = set; then -+ enableval=$enable_xres; RES=$enableval -+else -+ RES=yes -+fi - -+# Check whether --enable-record was given. -+if test "${enable_record+set}" = set; then -+ enableval=$enable_record; RECORD=$enableval -+else -+ RECORD=no -+fi - --cat >>confdefs.h <<_ACEOF --#define bswap_32 ${BSWAP}32 --_ACEOF -+# Check whether --enable-xv was given. -+if test "${enable_xv+set}" = set; then -+ enableval=$enable_xv; XV=$enableval -+else -+ XV=yes -+fi - -+# Check whether --enable-xvmc was given. -+if test "${enable_xvmc+set}" = set; then -+ enableval=$enable_xvmc; XVMC=$enableval -+else -+ XVMC=yes -+fi - --cat >>confdefs.h <<_ACEOF --#define bswap_64 ${BSWAP}64 --_ACEOF -+# Check whether --enable-dga was given. -+if test "${enable_dga+set}" = set; then -+ enableval=$enable_dga; DGA=$enableval -+else -+ DGA=auto -+fi - -- fi -+# Check whether --enable-screensaver was given. -+if test "${enable_screensaver+set}" = set; then -+ enableval=$enable_screensaver; SCREENSAVER=$enableval -+else -+ SCREENSAVER=yes - fi - --ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" --if test "x$ac_cv_func_dlopen" = x""yes; then : -+# Check whether --enable-xdmcp was given. -+if test "${enable_xdmcp+set}" = set; then -+ enableval=$enable_xdmcp; XDMCP=$enableval -+else -+ XDMCP=auto -+fi - -+# Check whether --enable-xdm-auth-1 was given. -+if test "${enable_xdm_auth_1+set}" = set; then -+ enableval=$enable_xdm_auth_1; XDMAUTH=$enableval - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ XDMAUTH=auto -+fi -+ -+# Check whether --enable-glx was given. -+if test "${enable_glx+set}" = set; then -+ enableval=$enable_glx; GLX=$enableval - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ GLX=yes -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_dl_dlopen=yes -+# Check whether --enable-dri was given. -+if test "${enable_dri+set}" = set; then -+ enableval=$enable_dri; DRI=$enableval -+fi -+ -+# Check whether --enable-dri2 was given. -+if test "${enable_dri2+set}" = set; then -+ enableval=$enable_dri2; DRI2=$enableval - else -- ac_cv_lib_dl_dlopen=no -+ DRI2=auto - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ -+# Check whether --enable-xinerama was given. -+if test "${enable_xinerama+set}" = set; then -+ enableval=$enable_xinerama; XINERAMA=$enableval -+else -+ XINERAMA=yes - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : -- DLOPEN_LIBS="-ldl" -+ -+# Check whether --enable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval -+else -+ XF86VIDMODE=auto - fi - -+# Check whether --enable-xace was given. -+if test "${enable_xace+set}" = set; then -+ enableval=$enable_xace; XACE=$enableval -+else -+ XACE=yes - fi - -+# Check whether --enable-xselinux was given. -+if test "${enable_xselinux+set}" = set; then -+ enableval=$enable_xselinux; XSELINUX=$enableval -+else -+ XSELINUX=no -+fi - --for ac_func in vprintf --do : -- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" --if test "x$ac_cv_func_vprintf" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_VPRINTF 1 --_ACEOF -+# Check whether --enable-xcsecurity was given. -+if test "${enable_xcsecurity+set}" = set; then -+ enableval=$enable_xcsecurity; XCSECURITY=$enableval -+else -+ XCSECURITY=no -+fi - --ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" --if test "x$ac_cv_func__doprnt" = x""yes; then : -+# Check whether --enable-xcalibrate was given. -+if test "${enable_xcalibrate+set}" = set; then -+ enableval=$enable_xcalibrate; XCALIBRATE=$enableval -+else -+ XCALIBRATE=no -+fi - --$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -+# Check whether --enable-tslib was given. -+if test "${enable_tslib+set}" = set; then -+ enableval=$enable_tslib; TSLIB=$enableval -+else -+ TSLIB=no -+fi - -+# Check whether --enable-multibuffer was given. -+if test "${enable_multibuffer+set}" = set; then -+ enableval=$enable_multibuffer; MULTIBUFFER=$enableval -+else -+ MULTIBUFFER=no - fi - -+# Check whether --enable-dbe was given. -+if test "${enable_dbe+set}" = set; then -+ enableval=$enable_dbe; DBE=$enableval -+else -+ DBE=yes - fi --done - -+# Check whether --enable-xf86bigfont was given. -+if test "${enable_xf86bigfont+set}" = set; then -+ enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval -+else -+ XF86BIGFONT=no -+fi - --for ac_func in geteuid getuid link memmove memset mkstemp strchr strrchr \ -- strtol getopt getopt_long vsnprintf walkcontext backtrace \ -- getisax getzoneid shmctl64 strcasestr ffs --do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --eval as_val=\$$as_ac_var -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+# Check whether --enable-dpms was given. -+if test "${enable_dpms+set}" = set; then -+ enableval=$enable_dpms; DPMSExtension=$enableval -+else -+ DPMSExtension=yes -+fi - -+# Check whether --enable-config-dbus was given. -+if test "${enable_config_dbus+set}" = set; then -+ enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval -+else -+ CONFIG_DBUS_API=no - fi --done - --# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works --# for constant arguments. Useless! --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 --$as_echo_n "checking for working alloca.h... " >&6; } --if test "${ac_cv_working_alloca_h+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+# Check whether --enable-config-hal was given. -+if test "${enable_config_hal+set}" = set; then -+ enableval=$enable_config_hal; CONFIG_HAL=$enableval - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --int --main () --{ --char *p = (char *) alloca (2 * sizeof (int)); -- if (p) return 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_working_alloca_h=yes -+ CONFIG_HAL=auto -+fi -+ -+# Check whether --enable-xfree86-utils was given. -+if test "${enable_xfree86_utils+set}" = set; then -+ enableval=$enable_xfree86_utils; XF86UTILS=$enableval - else -- ac_cv_working_alloca_h=no -+ XF86UTILS=yes - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+# Check whether --enable-xaa was given. -+if test "${enable_xaa+set}" = set; then -+ enableval=$enable_xaa; XAA=$enableval -+else -+ XAA=yes - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 --$as_echo "$ac_cv_working_alloca_h" >&6; } --if test $ac_cv_working_alloca_h = yes; then - --$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h -+# Check whether --enable-vgahw was given. -+if test "${enable_vgahw+set}" = set; then -+ enableval=$enable_vgahw; VGAHW=$enableval -+else -+ VGAHW=yes -+fi - -+# Check whether --enable-vbe was given. -+if test "${enable_vbe+set}" = set; then -+ enableval=$enable_vbe; VBE=$enableval -+else -+ VBE=yes - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 --$as_echo_n "checking for alloca... " >&6; } --if test "${ac_cv_func_alloca_works+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+# Check whether --enable-int10-module was given. -+if test "${enable_int10_module+set}" = set; then -+ enableval=$enable_int10_module; INT10MODULE=$enableval - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#ifdef __GNUC__ --# define alloca __builtin_alloca --#else --# ifdef _MSC_VER --# include --# define alloca _alloca --# else --# ifdef HAVE_ALLOCA_H --# include --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca /* predefined by HP cc +Olibcalls */ --char *alloca (); --# endif --# endif --# endif --# endif --#endif -+ INT10MODULE=yes -+fi - --int --main () --{ --char *p = (char *) alloca (1); -- if (p) return 0; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_func_alloca_works=yes -+ -+# Check whether --enable-xorg was given. -+if test "${enable_xorg+set}" = set; then -+ enableval=$enable_xorg; XORG=$enableval - else -- ac_cv_func_alloca_works=no -+ XORG=auto - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+# Check whether --enable-dmx was given. -+if test "${enable_dmx+set}" = set; then -+ enableval=$enable_dmx; DMX=$enableval -+else -+ DMX=auto - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 --$as_echo "$ac_cv_func_alloca_works" >&6; } - --if test $ac_cv_func_alloca_works = yes; then -+# Check whether --enable-xvfb was given. -+if test "${enable_xvfb+set}" = set; then -+ enableval=$enable_xvfb; XVFB=$enableval -+else -+ XVFB=yes -+fi - --$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -+# Check whether --enable-xnest was given. -+if test "${enable_xnest+set}" = set; then -+ enableval=$enable_xnest; XNEST=$enableval -+else -+ XNEST=auto -+fi - -+# Check whether --enable-xquartz was given. -+if test "${enable_xquartz+set}" = set; then -+ enableval=$enable_xquartz; XQUARTZ=$enableval - else -- # The SVR3 libPW and SVR4 libucb both contain incompatible functions --# that cause trouble. Some versions do not even contain alloca or --# contain a buggy version. If you still want to use their alloca, --# use ar to extract alloca.o from them instead of compiling alloca.c. -+ XQUARTZ=auto -+fi - --ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -+# Check whether --enable-standalone-xpbproxy was given. -+if test "${enable_standalone_xpbproxy+set}" = set; then -+ enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval -+else -+ STANDALONE_XPBPROXY=no -+fi - --$as_echo "#define C_ALLOCA 1" >>confdefs.h -+# Check whether --enable-xwin was given. -+if test "${enable_xwin+set}" = set; then -+ enableval=$enable_xwin; XWIN=$enableval -+else -+ XWIN=auto -+fi - -+# Check whether --enable-kdrive was given. -+if test "${enable_kdrive+set}" = set; then -+ enableval=$enable_kdrive; KDRIVE=$enableval -+else -+ KDRIVE=no -+fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 --$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } --if test "${ac_cv_os_cray+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+# Check whether --enable-xephyr was given. -+if test "${enable_xephyr+set}" = set; then -+ enableval=$enable_xephyr; XEPHYR=$enableval - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#if defined CRAY && ! defined CRAY2 --webecray --#else --wenotbecray --#endif -+ XEPHYR=auto -+fi - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "webecray" >/dev/null 2>&1; then : -- ac_cv_os_cray=yes -+# Check whether --enable-xfake was given. -+if test "${enable_xfake+set}" = set; then -+ enableval=$enable_xfake; XFAKE=$enableval - else -- ac_cv_os_cray=no -+ XFAKE=auto - fi --rm -f conftest* - -+# Check whether --enable-xfbdev was given. -+if test "${enable_xfbdev+set}" = set; then -+ enableval=$enable_xfbdev; XFBDEV=$enableval -+else -+ XFBDEV=auto - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 --$as_echo "$ac_cv_os_cray" >&6; } --if test $ac_cv_os_cray = yes; then -- for ac_func in _getb67 GETB67 getb67; do -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --eval as_val=\$$as_ac_var -- if test "x$as_val" = x""yes; then : - --cat >>confdefs.h <<_ACEOF --#define CRAY_STACKSEG_END $ac_func --_ACEOF - -- break -+ -+# Check whether --enable-install-setuid was given. -+if test "${enable_install_setuid+set}" = set; then -+ enableval=$enable_install_setuid; SETUID=$enableval -+else -+ SETUID=auto - fi - -- done -+{ $as_echo "$as_me:$LINENO: checking to see if we can install the Xorg server as root" >&5 -+$as_echo_n "checking to see if we can install the Xorg server as root... " >&6; } -+if test "x$SETUID" = "xauto" ; then -+ case $host_os in -+ darwin*) SETUID="no" ;; -+ *) -+ case $host_cpu in -+ sparc) SETUID="no" ;; -+ *) SETUID="yes" ;; -+ esac -+ esac -+ if test "x$SETUID" = xyes; then -+ touch testfile -+ chown root testfile > /dev/null 2>&1 || SETUID="no" -+ rm -f testfile -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $SETUID" >&5 -+$as_echo "$SETUID" >&6; } -+ if test "x$SETUID" = "xyes"; then -+ INSTALL_SETUID_TRUE= -+ INSTALL_SETUID_FALSE='#' -+else -+ INSTALL_SETUID_TRUE='#' -+ INSTALL_SETUID_FALSE= - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 --$as_echo_n "checking stack direction for C alloca... " >&6; } --if test "${ac_cv_c_stack_direction+set}" = set; then : -+ -+ -+ -+# Transport selection macro from xtrans.m4 -+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- ac_cv_c_stack_direction=0 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ 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 --int --find_stack_direction () --{ -- static char *addr = 0; -- auto char dummy; -- if (addr == 0) -- { -- addr = &dummy; -- return find_stack_direction (); -- } -- else -- return (&dummy > addr) ? 1 : -1; --} -+#include -+#include - - int - main () - { -- return find_stack_direction () < 0; -+return *(signal (0, 0)) (0) == 1; -+ ; -+ return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ac_cv_c_stack_direction=1 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_type_signal=int - else -- ac_cv_c_stack_direction=-1 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_signal=void - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 --$as_echo "$ac_cv_c_stack_direction" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } -+ - cat >>confdefs.h <<_ACEOF --#define STACK_DIRECTION $ac_cv_c_stack_direction -+#define RETSIGTYPE $ac_cv_type_signal - _ACEOF - - --fi - --ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize" --if test "x$ac_cv_func_getdtablesize" = x""yes; then : - --$as_echo "#define HAS_GETDTABLESIZE 1" >>confdefs.h - -+ case $host_os in -+ mingw*) unixdef="no" ;; -+ *) unixdef="yes" ;; -+ esac -+ # Check whether --enable-unix-transport was given. -+if test "${enable_unix_transport+set}" = set; then -+ enableval=$enable_unix_transport; UNIXCONN=$enableval -+else -+ UNIXCONN=$unixdef - fi - --ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" --if test "x$ac_cv_func_getifaddrs" = x""yes; then : -+ { $as_echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5 -+$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } -+ if test "$UNIXCONN" = "yes"; then - --$as_echo "#define HAS_GETIFADDRS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define UNIXCONN 1 -+_ACEOF - -+ fi -+ { $as_echo "$as_me:$LINENO: result: $UNIXCONN" >&5 -+$as_echo "$UNIXCONN" >&6; } -+ # Check whether --enable-tcp-transport was given. -+if test "${enable_tcp_transport+set}" = set; then -+ enableval=$enable_tcp_transport; TCPCONN=$enableval -+else -+ TCPCONN=yes - fi - --ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid" --if test "x$ac_cv_func_getpeereid" = x""yes; then : -+ { $as_echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5 -+$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $TCPCONN" >&5 -+$as_echo "$TCPCONN" >&6; } -+ if test "$TCPCONN" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define TCPCONN 1 -+_ACEOF - --$as_echo "#define HAS_GETPEEREID 1" >>confdefs.h - --fi -+ # SVR4 hides these in libraries other than libc -+ { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5 -+$as_echo_n "checking for library containing socket... " >&6; } -+if test "${ac_cv_search_socket+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --ac_fn_c_check_func "$LINENO" "getpeerucred" "ac_cv_func_getpeerucred" --if test "x$ac_cv_func_getpeerucred" = x""yes; then : -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char socket (); -+int -+main () -+{ -+return socket (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' socket; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_socket=$ac_res -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --$as_echo "#define HAS_GETPEERUCRED 1" >>confdefs.h - - fi - --ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" --if test "x$ac_cv_func_strlcat" = x""yes; then : -- HAVE_STRLCAT=yes --else -- HAVE_STRLCAT=no -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_socket+set}" = set; then -+ break - fi -- -- if test x$HAVE_STRLCAT = xno; then -- NEED_STRLCAT_TRUE= -- NEED_STRLCAT_FALSE='#' -+done -+if test "${ac_cv_search_socket+set}" = set; then -+ : - else -- NEED_STRLCAT_TRUE='#' -- NEED_STRLCAT_FALSE= -+ ac_cv_search_socket=no - fi -- --ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" --if test "x$ac_cv_func_strlcpy" = x""yes; then : -- --$as_echo "#define HAS_STRLCPY 1" >>confdefs.h -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 -+$as_echo "$ac_cv_search_socket" >&6; } -+ac_res=$ac_cv_search_socket -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - -+ { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 -+$as_echo_n "checking for library containing gethostbyname... " >&6; } -+if test "${ac_cv_search_gethostbyname+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- if test x$HAVE_VSNPRINTF = xno; then -- NEED_VSNPRINTF_TRUE= -- NEED_VSNPRINTF_FALSE='#' -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); -+int -+main () -+{ -+return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' nsl; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_gethostbyname=$ac_res - else -- NEED_VSNPRINTF_TRUE='#' -- NEED_VSNPRINTF_FALSE= --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - --ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" --if test "x$ac_cv_func_mmap" = x""yes; then : -+fi - --$as_echo "#define HAS_MMAP 1" >>confdefs.h -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_gethostbyname+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_gethostbyname+set}" = set; then -+ : -+else -+ ac_cv_search_gethostbyname=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 -+$as_echo "$ac_cv_search_gethostbyname" >&6; } -+ac_res=$ac_cv_search_gethostbyname -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 --$as_echo_n "checking for sqrt in -lm... " >&6; } --if test "${ac_cv_lib_m_sqrt+set}" = set; then : -+{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 -+$as_echo_n "checking for main in -lws2_32... " >&6; } -+if test "${ac_cv_lib_ws2_32_main+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+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. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char sqrt (); -+ - int - main () - { --return sqrt (); -+return main (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_m_sqrt=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_ws2_32_main=yes - else -- ac_cv_lib_m_sqrt=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_ws2_32_main=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 --$as_echo "$ac_cv_lib_m_sqrt" >&6; } --if test "x$ac_cv_lib_m_sqrt" = x""yes; then : -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5 -+$as_echo "$ac_cv_lib_ws2_32_main" >&6; } -+if test "x$ac_cv_lib_ws2_32_main" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_LIBM 1 -+#define HAVE_LIBWS2_32 1 - _ACEOF - -- LIBS="-lm $LIBS" -+ LIBS="-lws2_32 $LIBS" - - fi -+ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cbrt in -lm" >&5 --$as_echo_n "checking for cbrt in -lm... " >&6; } --if test "${ac_cv_lib_m_cbrt+set}" = set; then : -+ -+ # Needs to come after above checks for libsocket & libnsl for SVR4 systems -+ # Check whether --enable-ipv6 was given. -+if test "${enable_ipv6+set}" = set; then -+ enableval=$enable_ipv6; IPV6CONN=$enableval -+else -+ { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5 -+$as_echo_n "checking for getaddrinfo... " >&6; } -+if test "${ac_cv_func_getaddrinfo+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define getaddrinfo to an innocuous variant, in case declares getaddrinfo. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define getaddrinfo innocuous_getaddrinfo -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getaddrinfo (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef getaddrinfo - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -14503,284 +21045,463 @@ - #ifdef __cplusplus - extern "C" - #endif --char cbrt (); -+char getaddrinfo (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_getaddrinfo || defined __stub___getaddrinfo -+choke me -+#endif -+ - int - main () - { --return cbrt (); -+return getaddrinfo (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_m_cbrt=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_getaddrinfo=yes - else -- ac_cv_lib_m_cbrt=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_getaddrinfo=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cbrt" >&5 --$as_echo "$ac_cv_lib_m_cbrt" >&6; } --if test "x$ac_cv_lib_m_cbrt" = x""yes; then : - --$as_echo "#define HAVE_CBRT 1" >>confdefs.h -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 -+$as_echo "$ac_cv_func_getaddrinfo" >&6; } -+if test "x$ac_cv_func_getaddrinfo" = x""yes; then -+ IPV6CONN=yes -+else -+ IPV6CONN=no -+fi - - fi - -+ { $as_echo "$as_me:$LINENO: checking if IPv6 support should be built" >&5 -+$as_echo_n "checking if IPv6 support should be built... " >&6; } -+ if test "$IPV6CONN" = "yes"; then - --for ac_header in ndbm.h dbm.h rpcsvc/dbm.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+cat >>confdefs.h <<\_ACEOF -+#define IPv6 1 - _ACEOF - --fi -+ fi -+ { $as_echo "$as_me:$LINENO: result: $IPV6CONN" >&5 -+$as_echo "$IPV6CONN" >&6; } - --done -+ # 4.3BSD-Reno added a new member to struct sockaddr_in -+ { $as_echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5 -+$as_echo_n "checking for struct sockaddr_in.sin_len... " >&6; } -+if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include -+#include -+#include - - --for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+int -+main () -+{ -+static struct sockaddr_in ac_aggr; -+if (ac_aggr.sin_len) -+return 0; -+ ; -+ return 0; -+} - _ACEOF -- AGP=yes --fi -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_sockaddr_in_sin_len=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --done -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- if test "x$AGP" = xyes; then -- AGP_TRUE= -- AGP_FALSE='#' --else -- AGP_TRUE='#' -- AGP_FALSE= --fi -+#include -+#include -+#include - - --for ac_header in linux/apm_bios.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "linux/apm_bios.h" "ac_cv_header_linux_apm_bios_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_apm_bios_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LINUX_APM_BIOS_H 1 -+int -+main () -+{ -+static struct sockaddr_in ac_aggr; -+if (sizeof ac_aggr.sin_len) -+return 0; -+ ; -+ return 0; -+} - _ACEOF -- LNXAPM=yes --fi -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_sockaddr_in_sin_len=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --done -+ ac_cv_member_struct_sockaddr_in_sin_len=no -+fi - -- if test "x$LNXAPM" = xyes; then -- LNXAPM_TRUE= -- LNXAPM_FALSE='#' --else -- LNXAPM_TRUE='#' -- LNXAPM_FALSE= -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5 -+$as_echo "$ac_cv_member_struct_sockaddr_in_sin_len" >&6; } -+if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then - --for ac_header in linux/fb.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_fb_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LINUX_FB_H 1 -+cat >>confdefs.h <<\_ACEOF -+#define BSD44SOCKETS 1 - _ACEOF -- FBDEV=yes -+ - fi - --done - -- if test "x$FBDEV" = xyes; then -- FBDEVHW_TRUE= -- FBDEVHW_FALSE='#' -+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. -+ { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5 -+$as_echo_n "checking for socklen_t... " >&6; } -+if test "${ac_cv_type_socklen_t+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- FBDEVHW_TRUE='#' -- FBDEVHW_FALSE= --fi -+ ac_cv_type_socklen_t=no -+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 - --for ac_header in asm/mtrr.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "asm/mtrr.h" "ac_cv_header_asm_mtrr_h" "$ac_includes_default" --if test "x$ac_cv_header_asm_mtrr_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_ASM_MTRR_H 1 -+int -+main () -+{ -+if (sizeof (socklen_t)) -+ return 0; -+ ; -+ return 0; -+} - _ACEOF -- ac_cv_asm_mtrr_h=yes --fi -- --done -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --if test "x$ac_cv_asm_mtrr_h" = xyes; then -- HAVE_MTRR=yes --fi -+$ac_includes_default -+#include - --for ac_header in sys/memrange.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/memrange.h" "ac_cv_header_sys_memrange_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_memrange_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_MEMRANGE_H 1 -+int -+main () -+{ -+if (sizeof ((socklen_t))) -+ return 0; -+ ; -+ return 0; -+} - _ACEOF -- ac_cv_memrange_h=yes --fi -- --done -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if test "x$ac_cv_memrange_h" = xyes; then -- HAVE_MTRR=yes -+ ac_cv_type_socklen_t=yes - fi - --if test "x$HAVE_MTRR" = xyes; then -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --$as_echo "#define HAS_MTRR_SUPPORT 1" >>confdefs.h - - fi - --for ac_header in machine/mtrr.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "machine/mtrr.h" "ac_cv_header_machine_mtrr_h" "$ac_includes_default" --if test "x$ac_cv_header_machine_mtrr_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_MACHINE_MTRR_H 1 --_ACEOF -- ac_cv_machine_mtrr_h=yes -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 -+$as_echo "$ac_cv_type_socklen_t" >&6; } -+if test "x$ac_cv_type_socklen_t" = x""yes; then - --done -- --if test "x$ac_cv_machine_mtrr_h" = xyes; then -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SOCKLEN_T 1 -+_ACEOF - --$as_echo "#define HAS_MTRR_BUILTIN 1" >>confdefs.h - - fi - --for ac_header in sys/linker.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/linker.h" "ac_cv_header_sys_linker_h" "#include --" --if test "x$ac_cv_header_sys_linker_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_LINKER_H 1 --_ACEOF -- ac_cv_sys_linker_h=yes --else -- ac_cv_sys_linker_h=no --fi - --done - -- if test "x$ac_cv_sys_linker_h" = xyes; then -- FREEBSD_KLDLOAD_TRUE= -- FREEBSD_KLDLOAD_FALSE='#' -+ fi -+ case $host_os in -+ solaris*|sco*|sysv4*) localdef="yes" ;; -+ *) localdef="no" ;; -+ esac -+ # Check whether --enable-local-transport was given. -+if test "${enable_local_transport+set}" = set; then -+ enableval=$enable_local_transport; LOCALCONN=$enableval - else -- FREEBSD_KLDLOAD_TRUE='#' -- FREEBSD_KLDLOAD_FALSE= -+ LOCALCONN=$localdef - fi - -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSV IPC" >&5 --$as_echo_n "checking for SYSV IPC... " >&6; } --if test "${ac_cv_sysv_ipc+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --#include --#include -- --int --main () --{ -- --{ -- int id; -- id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); -- if (id < 0) return -1; -- return shmctl(id, IPC_RMID, 0); --} -- ; -- return 0; --} -+ { $as_echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5 -+$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $LOCALCONN" >&5 -+$as_echo "$LOCALCONN" >&6; } -+ if test "$LOCALCONN" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define LOCALCONN 1 - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_sysv_ipc=yes --else -- ac_cv_sysv_ipc=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sysv_ipc" >&5 --$as_echo "$ac_cv_sysv_ipc" >&6; } --if test "x$ac_cv_sysv_ipc" = xyes; then - --$as_echo "#define HAVE_SYSV_IPC 1" >>confdefs.h -+ fi - --fi - --if test -c /dev/xf86 ; then - --$as_echo "#define HAS_APERTURE_DRV 1" >>confdefs.h -+# Secure RPC detection macro from xtrans.m4 - -+ # Check whether --enable-secure-rpc was given. -+if test "${enable_secure_rpc+set}" = set; then -+ enableval=$enable_secure_rpc; SECURE_RPC=$enableval -+else -+ SECURE_RPC="try" - fi - --ac_fn_c_check_header_mongrel "$LINENO" "machine/apmvar.h" "ac_cv_header_machine_apmvar_h" "$ac_includes_default" --if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then : - -- ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_event_h" = x""yes; then : -- ac_cv_BSD_KQUEUE_APM=yes -+ if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then -+ FOUND_SECURE_RPC="no" -+ -+ -+for ac_func in authdes_seccreate authdes_create -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_BSD_APM=yes --fi -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --fi -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef $ac_func - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - -- if test "x$ac_cv_BSD_APM" = xyes; then -- BSD_APM_TRUE= -- BSD_APM_FALSE='#' -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- BSD_APM_TRUE='#' -- BSD_APM_FALSE= --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- if test "x$ac_cv_BSD_KQUEUE_APM" = xyes; then -- BSD_KQUEUE_APM_TRUE= -- BSD_KQUEUE_APM_FALSE='#' --else -- BSD_KQUEUE_APM_TRUE='#' -- BSD_KQUEUE_APM_FALSE= -+ eval "$as_ac_var=no" - fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ FOUND_SECURE_RPC="yes" -+fi -+done - --ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" --if test "x$ac_cv_header_execinfo_h" = x""yes; then : -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5 --$as_echo_n "checking for backtrace in -lc... " >&6; } --if test "${ac_cv_lib_c_backtrace+set}" = set; then : -+ if test "x$FOUND_SECURE_RPC" = "xno" ; then -+ if test "x$SECURE_RPC" = "xyes" ; then -+ { { $as_echo "$as_me:$LINENO: error: Secure RPC requested, but required functions not found" >&5 -+$as_echo "$as_me: error: Secure RPC requested, but required functions not found" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ SECURE_RPC="no" -+ else -+ { $as_echo "$as_me:$LINENO: checking for library containing getsecretkey" >&5 -+$as_echo_n "checking for library containing getsecretkey... " >&6; } -+if test "${ac_cv_search_getsecretkey+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lc $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -14789,1601 +21510,1892 @@ - #ifdef __cplusplus - extern "C" - #endif --char backtrace (); -+char getsecretkey (); - int - main () - { --return backtrace (); -+return getsecretkey (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_c_backtrace=yes -+for ac_lib in '' rpcsvc; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_getsecretkey=$ac_res - else -- ac_cv_lib_c_backtrace=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 --$as_echo "$ac_cv_lib_c_backtrace" >&6; } --if test "x$ac_cv_lib_c_backtrace" = x""yes; then : -- -- --$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h -- -- --$as_echo "#define HAVE_EXECINFO_H 1" >>confdefs.h -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -- -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_getsecretkey+set}" = set; then -+ break - fi -+done -+if test "${ac_cv_search_getsecretkey+set}" = set; then -+ : -+else -+ ac_cv_search_getsecretkey=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getsecretkey" >&5 -+$as_echo "$ac_cv_search_getsecretkey" >&6; } -+ac_res=$ac_cv_search_getsecretkey -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+fi - -+ SECURE_RPC="yes" -+ fi -+ fi -+ { $as_echo "$as_me:$LINENO: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 -+$as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } -+ if test "x$SECURE_RPC" = "xyes" ; then - --DEFAULT_INT10="x86emu" -- -- --case $host_cpu in -- alpha*) -- ALPHA_VIDEO=yes -- case $host_os in -- *freebsd*) SYS_LIBS=-lio ;; -- *netbsd*) --$as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h -- ;; -- esac -- GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" -- ;; -- arm*) -- ARM_VIDEO=yes -- ;; -- i*86) -- I386_VIDEO=yes -- case $host_os in -- *freebsd*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h -- ;; -- *dragonfly*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h -- ;; -- *netbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h -- -- SYS_LIBS=-li386 -- ;; -- *openbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h -- -- SYS_LIBS=-li386 -- ;; -- esac -- ;; -- powerpc*) -- PPC_VIDEO=yes -- case $host_os in -- *freebsd*) DEFAULT_INT10=stub ;; -- esac -- ;; -- sparc*) -- SPARC64_VIDEO=yes -- BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" -- GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -- ;; -- x86_64*|amd64*) -- I386_VIDEO=yes -- case $host_os in -- *freebsd*) --$as_echo "#define USE_DEV_IO 1" >>confdefs.h -- ;; -- *dragonfly*) --$as_echo "#define USE_DEV_IO 1" >>confdefs.h -- ;; -- *netbsd*) --$as_echo "#define USE_I386_IOPL 1" >>confdefs.h -- -- SYS_LIBS=-lx86_64 -- ;; -- *openbsd*) --$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h -- -- SYS_LIBS=-lamd64 -- ;; -- esac -- GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -- ;; -- ia64*) -- GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -- ;; -- s390*) -- GLX_ARCH_DEFINES="-D__GLX_ALIGN64" -- ;; --esac -+cat >>confdefs.h <<\_ACEOF -+#define SECURE_RPC 1 -+_ACEOF - -+ fi -+ { $as_echo "$as_me:$LINENO: result: $SECURE_RPC" >&5 -+$as_echo "$SECURE_RPC" >&6; } - -- if test "x$ALPHA_VIDEO" = xyes; then -- ALPHA_VIDEO_TRUE= -- ALPHA_VIDEO_FALSE='#' -+ if test "x$SECURE_RPC" = xyes; then -+ SECURE_RPC_TRUE= -+ SECURE_RPC_FALSE='#' - else -- ALPHA_VIDEO_TRUE='#' -- ALPHA_VIDEO_FALSE= -+ SECURE_RPC_TRUE='#' -+ SECURE_RPC_FALSE= - fi - -- if test "x$ARM_VIDEO" = xyes; then -- ARM_VIDEO_TRUE= -- ARM_VIDEO_FALSE='#' --else -- ARM_VIDEO_TRUE='#' -- ARM_VIDEO_FALSE= --fi - -- if test "x$I386_VIDEO" = xyes; then -- I386_VIDEO_TRUE= -- I386_VIDEO_FALSE='#' -+ if test "x$INT10" = xvm86; then -+ INT10_VM86_TRUE= -+ INT10_VM86_FALSE='#' - else -- I386_VIDEO_TRUE='#' -- I386_VIDEO_FALSE= -+ INT10_VM86_TRUE='#' -+ INT10_VM86_FALSE= - fi - -- if test "x$PPC_VIDEO" = xyes; then -- PPC_VIDEO_TRUE= -- PPC_VIDEO_FALSE='#' -+ if test "x$INT10" = xx86emu; then -+ INT10_X86EMU_TRUE= -+ INT10_X86EMU_FALSE='#' - else -- PPC_VIDEO_TRUE='#' -- PPC_VIDEO_FALSE= -+ INT10_X86EMU_TRUE='#' -+ INT10_X86EMU_FALSE= - fi - -- if test "x$SPARC64_VIDEO" = xyes; then -- SPARC64_VIDEO_TRUE= -- SPARC64_VIDEO_FALSE='#' -+ if test "x$INT10" = xstub; then -+ INT10_STUB_TRUE= -+ INT10_STUB_FALSE='#' - else -- SPARC64_VIDEO_TRUE='#' -- SPARC64_VIDEO_FALSE= -+ INT10_STUB_TRUE='#' -+ INT10_STUB_FALSE= - fi - -- --DRI=no --USE_SIGIO_BY_DEFAULT="yes" --case $host_os in -- *freebsd* | *dragonfly*) -- case $host_os in -- kfreebsd*-gnu) ;; -- *) --$as_echo "#define CSRG_BASED 1" >>confdefs.h -- ;; -- esac -- --$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h -- -- --$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h -+if test "x$INT10" = xyes; then - - --$as_echo "#define SYSCONS_SUPPORT 1" >>confdefs.h -+for ac_header in sys/vm86.h sys/io.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- DRI=yes -- ;; -- *netbsd*) -+ ac_header_compiler=no -+fi - --$as_echo "#define CSRG_BASED 1" >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - --$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h -+fi - -- DRI=yes -- ;; -- *openbsd*) -+done - --$as_echo "#define CSRG_BASED 1" >>confdefs.h -+fi - -+ if test "x$BUILDDOCS" = xyes; then -+ BUILDDOCS_TRUE= -+ BUILDDOCS_FALSE='#' -+else -+ BUILDDOCS_TRUE='#' -+ BUILDDOCS_FALSE= -+fi - --$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h - - --$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h -+if test x$XORG_SGML_PATH = x ; then -+ XORG_SGML_PATH=$prefix/share/sgml -+fi -+HAVE_DEFS_ENT= - -- ;; -- *linux*) -- DRI=yes -- ;; -- *solaris*) -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- DRI=yes -+if test x"$cross_compiling" = x"yes" ; then -+ HAVE_DEFS_ENT=no - else -- DRI=no -+ as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5 -+$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; } -+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ test "$cross_compiling" = yes && -+ { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -+ { (exit 1); exit 1; }; } -+if test -r "$XORG_SGML_PATH/X11/defs.ent"; then -+ eval "$as_ac_File=yes" -+else -+ eval "$as_ac_File=no" -+fi -+fi -+ac_res=`eval 'as_val=${'$as_ac_File'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_File'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ HAVE_DEFS_ENT=yes - fi -- # Disable use of SIGIO by default until some system bugs are -- # fixed - see Sun/OpenSolaris bug id 6879897 -- USE_SIGIO_BY_DEFAULT="no" -- ;; -- darwin*) - --$as_echo "#define CSRG_BASED 1" >>confdefs.h -+fi - -- ;; --esac -+# Extract the first word of "linuxdoc", so it can be a program name with args. -+set dummy linuxdoc; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_LINUXDOC+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $LINUXDOC in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` --PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1` --if test "x$PVS" = "x"; then -- PVS="0" -+ ;; -+esac -+fi -+LINUXDOC=$ac_cv_path_LINUXDOC -+if test -n "$LINUXDOC"; then -+ { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5 -+$as_echo "$LINUXDOC" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - --VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)" --VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" - --VENDOR_NAME="The X.Org Foundation" --VENDOR_NAME_SHORT="X.Org" --VENDOR_WEB="http://wiki.x.org" -+# Extract the first word of "ps2pdf", so it can be a program name with args. -+set dummy ps2pdf; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_PS2PDF+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $PS2PDF in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - -+ ;; -+esac -+fi -+PS2PDF=$ac_cv_path_PS2PDF -+if test -n "$PS2PDF"; then -+ { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5 -+$as_echo "$PS2PDF" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi - - --# Check whether --enable-werror was given. --if test "${enable_werror+set}" = set; then : -- enableval=$enable_werror; as_fn_error "--enable-werror has been replaced by --enable-strict-compilation" "$LINENO" 5 --fi - -+{ $as_echo "$as_me:$LINENO: checking Whether to build documentation" >&5 -+$as_echo_n "checking Whether to build documentation... " >&6; } - --# Check whether --enable-debug was given. --if test "${enable_debug+set}" = set; then : -- enableval=$enable_debug; DEBUGGING=$enableval -+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then -+ BUILDDOC=yes - else -- DEBUGGING=no -+ BUILDDOC=no - fi - --# Check whether --enable-unit-tests was given. --if test "${enable_unit_tests+set}" = set; then : -- enableval=$enable_unit_tests; UNITTESTS=$enableval -+ if test x$BUILDDOC = xyes; then -+ BUILD_LINUXDOC_TRUE= -+ BUILD_LINUXDOC_FALSE='#' - else -- UNITTESTS=auto -+ BUILD_LINUXDOC_TRUE='#' -+ BUILD_LINUXDOC_FALSE= - fi - --# Check whether --enable-sigio-default was given. --if test "${enable_sigio_default+set}" = set; then : -- enableval=$enable_sigio_default; USE_SIGIO_BY_DEFAULT=$enableval --fi - -+{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5 -+$as_echo "$BUILDDOC" >&6; } - --# Check whether --with-int10 was given. --if test "${with_int10+set}" = set; then : -- withval=$with_int10; INT10="$withval" -+{ $as_echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5 -+$as_echo_n "checking Whether to build pdf documentation... " >&6; } -+ -+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then -+ BUILDPDFDOC=yes - else -- INT10="$DEFAULT_INT10" -+ BUILDPDFDOC=no - fi - -- --# Check whether --with-vendor-name was given. --if test "${with_vendor_name+set}" = set; then : -- withval=$with_vendor_name; VENDOR_NAME="$withval" -+ if test x$BUILDPDFDOC = xyes; then -+ BUILD_PDFDOC_TRUE= -+ BUILD_PDFDOC_FALSE='#' -+else -+ BUILD_PDFDOC_TRUE='#' -+ BUILD_PDFDOC_FALSE= - fi - - --# Check whether --with-vendor-name-short was given. --if test "${with_vendor_name_short+set}" = set; then : -- withval=$with_vendor_name_short; VENDOR_NAME_SHORT="$withval" --fi -+{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5 -+$as_echo "$BUILDPDFDOC" >&6; } -+ -+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -+MAKE_PDF="$PS2PDF" -+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" -+ - - --# Check whether --with-vendor-web was given. --if test "${with_vendor_web+set}" = set; then : -- withval=$with_vendor_web; VENDOR_WEB="$withval" --fi - - --# Check whether --with-module-dir was given. --if test "${with_module_dir+set}" = set; then : -- withval=$with_module_dir; moduledir="$withval" --else -- moduledir="${libdir}/xorg/modules" --fi - - --# Check whether --with-log-dir was given. --if test "${with_log_dir+set}" = set; then : -- withval=$with_log_dir; logdir="$withval" -+ if test "x$INSTALL_LIBXF86CONFIG" = xyes; then -+ INSTALL_LIBXF86CONFIG_TRUE= -+ INSTALL_LIBXF86CONFIG_FALSE='#' - else -- logdir="$localstatedir/log" -+ INSTALL_LIBXF86CONFIG_TRUE='#' -+ INSTALL_LIBXF86CONFIG_FALSE= - fi - - --# Check whether --with-builder-addr was given. --if test "${with_builder_addr+set}" = set; then : -- withval=$with_builder_addr; BUILDERADDR="$withval" --else -- BUILDERADDR="xorg@lists.freedesktop.org" --fi -+case $host_os in -+ darwin*) -+ DRI2=no - -+ if test x$XQUARTZ = xauto; then -+ { $as_echo "$as_me:$LINENO: checking whether to build Xquartz" >&5 -+$as_echo_n "checking whether to build Xquartz... " >&6; } -+if test "${xorg_cv_Carbon_framework+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else - --# Check whether --with-os-name was given. --if test "${with_os_name+set}" = set; then : -- withval=$with_os_name; OSNAME="$withval" -+ save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -framework Carbon" -+ cat >conftest.$ac_ext <<_ACEOF -+char FSFindFolder(); int main() { FSFindFolder(); return 0;} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ xorg_cv_Carbon_framework=yes - else -- OSNAME=`uname -srm` --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ xorg_cv_Carbon_framework=no -+fi - --# Check whether --with-os-vendor was given. --if test "${with_os_vendor+set}" = set; then : -- withval=$with_os_vendor; OSVENDOR="$withval" --else -- OSVENDOR="" -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS=$save_LDFLAGS - fi -+{ $as_echo "$as_me:$LINENO: result: $xorg_cv_Carbon_framework" >&5 -+$as_echo "$xorg_cv_Carbon_framework" >&6; } - -+ if test "X$xorg_cv_Carbon_framework" = Xyes; then -+ XQUARTZ=yes -+ else -+ XQUARTZ=no -+ fi -+ fi - --# Check whether --with-builderstring was given. --if test "${with_builderstring+set}" = set; then : -- withval=$with_builderstring; BUILDERSTRING="$withval" -+ if test "x$XQUARTZ" = xyes ; then -+ XQUARTZ=yes -+ XVFB=no -+ XNEST=no - --fi -+ COMPOSITE=no -+ DGA=no -+ DPMSExtension=no -+ XF86VIDMODE=no -+ fi -+ ;; -+ *) XQUARTZ=no ;; -+esac - -+XEXT_INC='-I$(top_srcdir)/Xext' -+XEXT_LIB='$(top_builddir)/Xext/libXext.la' -+XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - --# Check whether --with-fontdir was given. --if test "${with_fontdir+set}" = set; then : -- withval=$with_fontdir; FONTDIR="$withval" --else -- FONTDIR="${libdir}/X11/fonts" --fi -+VIDEOPROTO="videoproto" -+COMPOSITEPROTO="compositeproto >= 0.4" -+RECORDPROTO="recordproto >= 1.13.99.1" -+SCRNSAVERPROTO="scrnsaverproto >= 1.1" -+RESOURCEPROTO="resourceproto" -+DRIPROTO="xf86driproto >= 2.1.0" -+DRI2PROTO="dri2proto >= 2.1" -+XINERAMAPROTO="xineramaproto" -+BIGFONTPROTO="xf86bigfontproto >= 1.2.0" -+XCALIBRATEPROTO="xcalibrateproto" -+DGAPROTO="xf86dgaproto >= 2.0.99.1" -+GLPROTO="glproto >= 1.4.9" -+DMXPROTO="dmxproto >= 2.2.99.1" -+VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" -+WINDOWSWMPROTO="windowswmproto" -+APPLEWMPROTO="applewmproto >= 1.4" - --DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" --case $host_os in -- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; --esac -+REQUIRED_MODULES="randrproto >= 1.2.99.3 renderproto >= 0.11 fixesproto >= 4.1 damageproto >= 1.1 xcmiscproto >= 1.2.0 xextproto >= 7.0.99.3 xproto >= 7.0.13 xtrans >= 1.2.2 bigreqsproto >= 1.1.0 fontsproto inputproto >= 1.9.99.902 kbproto >= 1.0.3" -+REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20" - --# Check whether --with-default-font-path was given. --if test "${with_default_font_path+set}" = set; then : -- withval=$with_default_font_path; FONTPATH="$withval" --else -- FONTPATH="${DEFAULT_FONT_PATH}" --fi -+LIBAPPLEWM="applewm >= 1.4" -+LIBDMX="dmx >= 1.0.99.1" -+LIBDRI="dri >= 7.1.0" -+LIBDRM="libdrm >= 2.3.0" -+LIBGL="gl >= 7.1.0" -+LIBXEXT="xext >= 1.0.99.4" -+LIBXI="xi >= 1.2.99.1" -+LIBXTST="xtst >= 1.0.99.2" -+LIBPCIACCESS="pciaccess >= 0.8.0" -+LIBGLIB="glib-2.0 >= 2.16" - - -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 -+$as_echo_n "checking for DBUS... " >&6; } - --# Check whether --with-xkb-path was given. --if test "${with_xkb_path+set}" = set; then : -- withval=$with_xkb_path; XKBPATH="$withval" -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DBUS_CFLAGS"; then -+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` - else -- XKBPATH="${datadir}/X11/xkb" -+ pkg_failed=yes - fi -- -- --# Check whether --with-xkb-output was given. --if test "${with_xkb_output+set}" = set; then : -- withval=$with_xkb_output; XKBOUTPUT="$withval" -+ fi +@@ -21165,7 +21165,7 @@ + if test "${with_xkb_output+set}" = set; then + withval=$with_xkb_output; XKBOUTPUT="$withval" else - XKBOUTPUT="compiled" -+ pkg_failed=untried ++ XKBOUTPUT="${localstatedir}/cache/xkb" fi -- -- --# Check whether --with-default-xkb-rules was given. --if test "${with_default_xkb_rules+set}" = set; then : -- withval=$with_default_xkb_rules; XKB_DFLT_RULES="$withval" -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DBUS_LIBS"; then -+ pkg_cv_DBUS_LIBS="$DBUS_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` - else -- XKB_DFLT_RULES="" -+ pkg_failed=yes - fi -- -- --# Check whether --with-default-xkb-model was given. --if test "${with_default_xkb_model+set}" = set; then : -- withval=$with_default_xkb_model; XKB_DFLT_MODEL="$withval" -+ fi - else -- XKB_DFLT_MODEL="pc104" -+ pkg_failed=untried - fi - - --# Check whether --with-default-xkb-layout was given. --if test "${with_default_xkb_layout+set}" = set; then : -- withval=$with_default_xkb_layout; XKB_DFLT_LAYOUT="$withval" -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- XKB_DFLT_LAYOUT="us" -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"` -+ else -+ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$DBUS_PKG_ERRORS" >&5 - -- --# Check whether --with-default-xkb-variant was given. --if test "${with_default_xkb_variant+set}" = set; then : -- withval=$with_default_xkb_variant; XKB_DFLT_VARIANT="$withval" -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_DBUS=no -+elif test $pkg_failed = untried; then -+ HAVE_DBUS=no - else -- XKB_DFLT_VARIANT="" -+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS -+ DBUS_LIBS=$pkg_cv_DBUS_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_DBUS=yes - fi -+if test "x$HAVE_DBUS" = xyes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_DBUS 1 -+_ACEOF - --# Check whether --with-default-xkb-options was given. --if test "${with_default_xkb_options+set}" = set; then : -- withval=$with_default_xkb_options; XKB_DFLT_OPTIONS="$withval" -+fi -+ if test "x$HAVE_DBUS" = xyes; then -+ HAVE_DBUS_TRUE= -+ HAVE_DBUS_FALSE='#' - else -- XKB_DFLT_OPTIONS="" -+ HAVE_DBUS_TRUE='#' -+ HAVE_DBUS_FALSE= - fi - - --# Check whether --with-serverconfig-path was given. --if test "${with_serverconfig_path+set}" = set; then : -- withval=$with_serverconfig_path; SERVERCONFIG="$withval" --else -- SERVERCONFIG="${libdir}/xorg" -+if test "x$CONFIG_DBUS_API" = xauto; then -+ CONFIG_DBUS_API="$HAVE_DBUS" - fi -+if test "x$CONFIG_DBUS_API" = xyes; then -+ if ! test "x$HAVE_DBUS" = xyes; then -+ { { $as_echo "$as_me:$LINENO: error: D-Bus configuration API requested, but D-Bus is not installed." >&5 -+$as_echo "$as_me: error: D-Bus configuration API requested, but D-Bus is not installed." >&2;} -+ { (exit 1); exit 1; }; } -+ fi - - --# Check whether --with-apple-applications-dir was given. --if test "${with_apple_applications_dir+set}" = set; then : -- withval=$with_apple_applications_dir; APPLE_APPLICATIONS_DIR="${withval}" -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_DBUS_API 1 -+_ACEOF -+ -+ CONFIG_NEED_DBUS="yes" -+fi -+ if test "x$CONFIG_DBUS_API" = xyes; then -+ CONFIG_DBUS_API_TRUE= -+ CONFIG_DBUS_API_FALSE='#' - else -- APPLE_APPLICATIONS_DIR="/Applications/Utilities" -+ CONFIG_DBUS_API_TRUE='#' -+ CONFIG_DBUS_API_FALSE= - fi - - - --# Check whether --with-apple-application-name was given. --if test "${with_apple_application_name+set}" = set; then : -- withval=$with_apple_application_name; APPLE_APPLICATION_NAME="${withval}" -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for HAL" >&5 -+$as_echo_n "checking for HAL... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$HAL_CFLAGS"; then -+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$HAL_LIBS"; then -+ pkg_cv_HAL_LIBS="$HAL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` - else -- APPLE_APPLICATION_NAME="X11" -+ pkg_failed=yes - fi -- -- -- --# Check whether --with-launchd-id-prefix was given. --if test "${with_launchd_id_prefix+set}" = set; then : -- withval=$with_launchd_id_prefix; LAUNCHD_ID_PREFIX="${withval}" -+ fi - else -- LAUNCHD_ID_PREFIX="org.x" -+ pkg_failed=untried - fi - - - --cat >>confdefs.h <<_ACEOF --#define LAUNCHD_ID_PREFIX "$LAUNCHD_ID_PREFIX" --_ACEOF -+if test $pkg_failed = yes; then - --# Check whether --enable-sparkle was given. --if test "${enable_sparkle+set}" = set; then : -- enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- XQUARTZ_SPARKLE="no" -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"` -+ else -+ HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$HAL_PKG_ERRORS" >&5 - -- --# Check whether --enable-builddocs was given. --if test "${enable_builddocs+set}" = set; then : -- enableval=$enable_builddocs; BUILDDOCS=$enableval -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_HAL=no -+elif test $pkg_failed = untried; then -+ HAVE_HAL=no - else -- BUILDDOCS=no -+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS -+ HAL_LIBS=$pkg_cv_HAL_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_HAL=yes - fi -- --# Check whether --enable-install-libxf86config was given. --if test "${enable_install_libxf86config+set}" = set; then : -- enableval=$enable_install_libxf86config; INSTALL_LIBXF86CONFIG=$enableval --else -- INSTALL_LIBXF86CONFIG=no -+if test "x$CONFIG_HAL" = xauto; then -+ CONFIG_HAL="$HAVE_HAL" - fi -+if test "x$CONFIG_HAL" = xyes; then -+ if ! test "x$HAVE_HAL" = xyes; then -+ { { $as_echo "$as_me:$LINENO: error: HAL hotplug API requested, but HAL is not installed." >&5 -+$as_echo "$as_me: error: HAL hotplug API requested, but HAL is not installed." >&2;} -+ { (exit 1); exit 1; }; } -+ fi - --# Check whether --enable-null-root-cursor was given. --if test "${enable_null_root_cursor+set}" = set; then : -- enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval --else -- NULL_ROOT_CURSOR=no --fi - --# Check whether --enable-visibility was given. --if test "${enable_visibility+set}" = set; then : -- enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_HAL 1 -+_ACEOF -+ -+ REQUIRED_LIBS="$REQUIRED_LIBS hal" -+ CONFIG_NEED_DBUS="yes" -+fi -+ if test "x$CONFIG_HAL" = xyes; then -+ CONFIG_HAL_TRUE= -+ CONFIG_HAL_FALSE='#' - else -- SYMBOL_VISIBILITY=auto -+ CONFIG_HAL_TRUE='#' -+ CONFIG_HAL_FALSE= - fi - - -+if test "x$CONFIG_NEED_DBUS" = xyes; then -+ REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" - --# Check whether --with-dri-driver-path was given. --if test "${with_dri_driver_path+set}" = set; then : -- withval=$with_dri_driver_path; DRI_DRIVER_PATH="$withval" --else -- DRI_DRIVER_PATH="${libdir}/dri" --fi -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_NEED_DBUS 1 -+_ACEOF - --# Check whether --enable-aiglx was given. --if test "${enable_aiglx+set}" = set; then : -- enableval=$enable_aiglx; AIGLX=$enableval --else -- AIGLX=yes - fi -- --# Check whether --enable-glx-tls was given. --if test "${enable_glx_tls+set}" = set; then : -- enableval=$enable_glx_tls; GLX_USE_TLS=$enableval -+ if test "x$CONFIG_NEED_DBUS" = xyes; then -+ CONFIG_NEED_DBUS_TRUE= -+ CONFIG_NEED_DBUS_FALSE='#' - else -- GLX_USE_TLS=no -+ CONFIG_NEED_DBUS_TRUE='#' -+ CONFIG_NEED_DBUS_FALSE= - fi - -+CONFIG_LIB='$(top_builddir)/config/libconfig.la' - --# Check whether --enable-registry was given. --if test "${enable_registry+set}" = set; then : -- enableval=$enable_registry; XREGISTRY=$enableval -+if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then -+ USE_SIGIO_BY_DEFAULT_VALUE=TRUE - else -- XREGISTRY=yes -+ USE_SIGIO_BY_DEFAULT_VALUE=FALSE - fi - --# Check whether --enable-composite was given. --if test "${enable_composite+set}" = set; then : -- enableval=$enable_composite; COMPOSITE=$enableval --else -- COMPOSITE=yes --fi -+cat >>confdefs.h <<_ACEOF -+#define USE_SIGIO_BY_DEFAULT $USE_SIGIO_BY_DEFAULT_VALUE -+_ACEOF - --# Check whether --enable-mitshm was given. --if test "${enable_mitshm+set}" = set; then : -- enableval=$enable_mitshm; MITSHM=$enableval --else -- MITSHM=yes --fi - --# Check whether --enable-xres was given. --if test "${enable_xres+set}" = set; then : -- enableval=$enable_xres; RES=$enableval --else -- RES=yes --fi -+{ $as_echo "$as_me:$LINENO: checking for glibc..." >&5 -+$as_echo_n "checking for glibc...... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF - --# Check whether --enable-record was given. --if test "${enable_record+set}" = set; then : -- enableval=$enable_record; RECORD=$enableval --else -- RECORD=no --fi -+#include -+#ifndef __GLIBC__ -+#error -+#endif - --# Check whether --enable-xv was given. --if test "${enable_xv+set}" = set; then : -- enableval=$enable_xv; XV=$enableval -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ glibc=yes - else -- XV=yes --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --enable-xvmc was given. --if test "${enable_xvmc+set}" = set; then : -- enableval=$enable_xvmc; XVMC=$enableval --else -- XVMC=yes -+ glibc=no - fi - --# Check whether --enable-dga was given. --if test "${enable_dga+set}" = set; then : -- enableval=$enable_dga; DGA=$enableval --else -- DGA=auto --fi -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $glibc" >&5 -+$as_echo "$glibc" >&6; } - --# Check whether --enable-screensaver was given. --if test "${enable_screensaver+set}" = set; then : -- enableval=$enable_screensaver; SCREENSAVER=$enableval --else -- SCREENSAVER=yes --fi - --# Check whether --enable-xdmcp was given. --if test "${enable_xdmcp+set}" = set; then : -- enableval=$enable_xdmcp; XDMCP=$enableval -+for ac_func in clock_gettime -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- XDMCP=auto --fi -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --# Check whether --enable-xdm-auth-1 was given. --if test "${enable_xdm_auth_1+set}" = set; then : -- enableval=$enable_xdm_auth_1; XDMAUTH=$enableval --else -- XDMAUTH=auto --fi -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --# Check whether --enable-glx was given. --if test "${enable_glx+set}" = set; then : -- enableval=$enable_glx; GLX=$enableval --else -- GLX=yes --fi -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --# Check whether --enable-dri was given. --if test "${enable_dri+set}" = set; then : -- enableval=$enable_dri; DRI=$enableval --fi -+#undef $ac_func - --# Check whether --enable-dri2 was given. --if test "${enable_dri2+set}" = set; then : -- enableval=$enable_dri2; DRI2=$enableval --else -- DRI2=auto --fi -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - --# Check whether --enable-xinerama was given. --if test "${enable_xinerama+set}" = set; then : -- enableval=$enable_xinerama; XINERAMA=$enableval -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- XINERAMA=yes -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi - --# Check whether --enable-xf86vidmode was given. --if test "${enable_xf86vidmode+set}" = set; then : -- enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval --else -- XF86VIDMODE=auto -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ have_clock_gettime=yes -+else -+ { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 -+$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lrt $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# Check whether --enable-xace was given. --if test "${enable_xace+set}" = set; then : -- enableval=$enable_xace; XACE=$enableval -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char clock_gettime (); -+int -+main () -+{ -+return clock_gettime (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_rt_clock_gettime=yes - else -- XACE=yes --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --enable-xselinux was given. --if test "${enable_xselinux+set}" = set; then : -- enableval=$enable_xselinux; XSELINUX=$enableval --else -- XSELINUX=no -+ ac_cv_lib_rt_clock_gettime=no - fi - --# Check whether --enable-xcsecurity was given. --if test "${enable_xcsecurity+set}" = set; then : -- enableval=$enable_xcsecurity; XCSECURITY=$enableval --else -- XCSECURITY=no -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -- --# Check whether --enable-xcalibrate was given. --if test "${enable_xcalibrate+set}" = set; then : -- enableval=$enable_xcalibrate; XCALIBRATE=$enableval -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 -+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then -+ have_clock_gettime=-lrt - else -- XCALIBRATE=no -+ have_clock_gettime=no - fi - --# Check whether --enable-tslib was given. --if test "${enable_tslib+set}" = set; then : -- enableval=$enable_tslib; TSLIB=$enableval --else -- TSLIB=no - fi -+done - --# Check whether --enable-multibuffer was given. --if test "${enable_multibuffer+set}" = set; then : -- enableval=$enable_multibuffer; MULTIBUFFER=$enableval --else -- MULTIBUFFER=no --fi - --# Check whether --enable-dbe was given. --if test "${enable_dbe+set}" = set; then : -- enableval=$enable_dbe; DBE=$enableval --else -- DBE=yes --fi -+{ $as_echo "$as_me:$LINENO: checking for a useful monotonic clock ..." >&5 -+$as_echo_n "checking for a useful monotonic clock ...... " >&6; } - --# Check whether --enable-xf86bigfont was given. --if test "${enable_xf86bigfont+set}" = set; then : -- enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval --else -- XF86BIGFONT=no --fi -+if ! test "x$have_clock_gettime" = xno; then -+ if ! test "x$have_clock_gettime" = xyes; then -+ CLOCK_LIBS="$have_clock_gettime" -+ else -+ CLOCK_LIBS="" -+ fi - --# Check whether --enable-dpms was given. --if test "${enable_dpms+set}" = set; then : -- enableval=$enable_dpms; DPMSExtension=$enableval --else -- DPMSExtension=yes --fi -+ LIBS_SAVE="$LIBS" -+ LIBS="$CLOCK_LIBS" -+ CPPFLAGS_SAVE="$CPPFLAGS" - --# Check whether --enable-config-dbus was given. --if test "${enable_config_dbus+set}" = set; then : -- enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval --else -- CONFIG_DBUS_API=no --fi -+ if test x"$glibc" = xyes; then -+ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" -+ fi - --# Check whether --enable-config-hal was given. --if test "${enable_config_hal+set}" = set; then : -- enableval=$enable_config_hal; CONFIG_HAL=$enableval -+ if test "$cross_compiling" = yes; then -+ MONOTONIC_CLOCK="cross compiling" - else -- CONFIG_HAL=auto --fi -+ cat >conftest.$ac_ext <<_ACEOF - --# Check whether --enable-xfree86-utils was given. --if test "${enable_xfree86_utils+set}" = set; then : -- enableval=$enable_xfree86_utils; XF86UTILS=$enableval --else -- XF86UTILS=yes --fi -+#include - --# Check whether --enable-xaa was given. --if test "${enable_xaa+set}" = set; then : -- enableval=$enable_xaa; XAA=$enableval --else -- XAA=yes --fi -+int main(int argc, char *argv[]) { -+ struct timespec tp; - --# Check whether --enable-vgahw was given. --if test "${enable_vgahw+set}" = set; then : -- enableval=$enable_vgahw; VGAHW=$enableval --else -- VGAHW=yes --fi -+ if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -+ return 0; -+ else -+ return 1; -+} - --# Check whether --enable-vbe was given. --if test "${enable_vbe+set}" = set; then : -- enableval=$enable_vbe; VBE=$enableval -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ MONOTONIC_CLOCK=yes - else -- VBE=yes --fi -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --enable-int10-module was given. --if test "${enable_int10_module+set}" = set; then : -- enableval=$enable_int10_module; INT10MODULE=$enableval --else -- INT10MODULE=yes -+( exit $ac_status ) -+MONOTONIC_CLOCK=no - fi -- -- --# Check whether --enable-xorg was given. --if test "${enable_xorg+set}" = set; then : -- enableval=$enable_xorg; XORG=$enableval --else -- XORG=auto -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - --# Check whether --enable-dmx was given. --if test "${enable_dmx+set}" = set; then : -- enableval=$enable_dmx; DMX=$enableval --else -- DMX=auto --fi - --# Check whether --enable-xvfb was given. --if test "${enable_xvfb+set}" = set; then : -- enableval=$enable_xvfb; XVFB=$enableval --else -- XVFB=yes --fi - --# Check whether --enable-xnest was given. --if test "${enable_xnest+set}" = set; then : -- enableval=$enable_xnest; XNEST=$enableval -+ LIBS="$LIBS_SAVE" -+ CPPFLAGS="$CPPFLAGS_SAVE" - else -- XNEST=auto -+ MONOTONIC_CLOCK=no - fi - --# Check whether --enable-xquartz was given. --if test "${enable_xquartz+set}" = set; then : -- enableval=$enable_xquartz; XQUARTZ=$enableval --else -- XQUARTZ=auto --fi -+{ $as_echo "$as_me:$LINENO: result: $MONOTONIC_CLOCK" >&5 -+$as_echo "$MONOTONIC_CLOCK" >&6; } - --# Check whether --enable-standalone-xpbproxy was given. --if test "${enable_standalone_xpbproxy+set}" = set; then : -- enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval --else -- STANDALONE_XPBPROXY=no --fi -+if test "x$MONOTONIC_CLOCK" = xyes; then - --# Check whether --enable-xwin was given. --if test "${enable_xwin+set}" = set; then : -- enableval=$enable_xwin; XWIN=$enableval --else -- XWIN=auto --fi -+cat >>confdefs.h <<\_ACEOF -+#define MONOTONIC_CLOCK 1 -+_ACEOF - --# Check whether --enable-kdrive was given. --if test "${enable_kdrive+set}" = set; then : -- enableval=$enable_kdrive; KDRIVE=$enableval --else -- KDRIVE=no -+ LIBS="$LIBS $CLOCK_LIBS" - fi - --# Check whether --enable-xephyr was given. --if test "${enable_xephyr+set}" = set; then : -- enableval=$enable_xephyr; XEPHYR=$enableval -+ if test "x$XV" = xyes; then -+ XV_TRUE= -+ XV_FALSE='#' - else -- XEPHYR=auto -+ XV_TRUE='#' -+ XV_FALSE= - fi - --# Check whether --enable-xfake was given. --if test "${enable_xfake+set}" = set; then : -- enableval=$enable_xfake; XFAKE=$enableval --else -- XFAKE=auto --fi -+if test "x$XV" = xyes; then - --# Check whether --enable-xfbdev was given. --if test "${enable_xfbdev+set}" = set; then : -- enableval=$enable_xfbdev; XFBDEV=$enableval --else -- XFBDEV=auto --fi -+cat >>confdefs.h <<\_ACEOF -+#define XV 1 -+_ACEOF - - -+cat >>confdefs.h <<\_ACEOF -+#define XvExtension 1 -+_ACEOF - --# Check whether --enable-install-setuid was given. --if test "${enable_install_setuid+set}" = set; then : -- enableval=$enable_install_setuid; SETUID=$enableval -+ REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" - else -- SETUID=auto -+ XVMC=no - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if we can install the Xorg server as root" >&5 --$as_echo_n "checking to see if we can install the Xorg server as root... " >&6; } --if test "x$SETUID" = "xauto" ; then -- case $host_os in -- darwin*) SETUID="no" ;; -- *) -- case $host_cpu in -- sparc) SETUID="no" ;; -- *) SETUID="yes" ;; -- esac -- esac -- if test "x$SETUID" = xyes; then -- touch testfile -- chown root testfile > /dev/null 2>&1 || SETUID="no" -- rm -f testfile -- fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETUID" >&5 --$as_echo "$SETUID" >&6; } -- if test "x$SETUID" = "xyes"; then -- INSTALL_SETUID_TRUE= -- INSTALL_SETUID_FALSE='#' -+ if test "x$XVMC" = xyes; then -+ XVMC_TRUE= -+ XVMC_FALSE='#' - else -- INSTALL_SETUID_TRUE='#' -- INSTALL_SETUID_FALSE= -+ XVMC_TRUE='#' -+ XVMC_FALSE= - fi - -+if test "x$XVMC" = xyes; then - -+cat >>confdefs.h <<\_ACEOF -+#define XvMCExtension 1 -+_ACEOF - -+fi - --# Transport selection macro from xtrans.m4 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } --if test "${ac_cv_type_signal+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include -- --int --main () --{ --return *(signal (0, 0)) (0) == 1; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_type_signal=int -+ if test "x$XREGISTRY" = xyes; then -+ XREGISTRY_TRUE= -+ XREGISTRY_FALSE='#' - else -- ac_cv_type_signal=void --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ XREGISTRY_TRUE='#' -+ XREGISTRY_FALSE= - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } - --cat >>confdefs.h <<_ACEOF --#define RETSIGTYPE $ac_cv_type_signal -+if test "x$XREGISTRY" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XREGISTRY 1 - _ACEOF - -+fi -+ -+ if test "x$COMPOSITE" = xyes; then -+ COMPOSITE_TRUE= -+ COMPOSITE_FALSE='#' -+else -+ COMPOSITE_TRUE='#' -+ COMPOSITE_FALSE= -+fi - -+if test "x$COMPOSITE" = xyes; then - -+cat >>confdefs.h <<\_ACEOF -+#define COMPOSITE 1 -+_ACEOF - -+ REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" -+ COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' -+ COMPOSITE_INC='-I$(top_srcdir)/composite' -+fi - -- case $host_os in -- mingw*) unixdef="no" ;; -- *) unixdef="yes" ;; -- esac -- # Check whether --enable-unix-transport was given. --if test "${enable_unix_transport+set}" = set; then : -- enableval=$enable_unix_transport; UNIXCONN=$enableval -+ if test "x$MITSHM" = xyes; then -+ MITSHM_TRUE= -+ MITSHM_FALSE='#' - else -- UNIXCONN=$unixdef -+ MITSHM_TRUE='#' -+ MITSHM_FALSE= - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 --$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } -- if test "$UNIXCONN" = "yes"; then -+if test "x$MITSHM" = xyes; then - --$as_echo "#define UNIXCONN 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define MITSHM 1 -+_ACEOF - -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 --$as_echo "$UNIXCONN" >&6; } -- # Check whether --enable-tcp-transport was given. --if test "${enable_tcp_transport+set}" = set; then : -- enableval=$enable_tcp_transport; TCPCONN=$enableval -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAS_SHM 1 -+_ACEOF -+ -+fi -+ -+ if test "x$RECORD" = xyes; then -+ RECORD_TRUE= -+ RECORD_FALSE='#' - else -- TCPCONN=yes -+ RECORD_TRUE='#' -+ RECORD_FALSE= - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 --$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 --$as_echo "$TCPCONN" >&6; } -- if test "$TCPCONN" = "yes"; then -+if test "x$RECORD" = xyes; then - --$as_echo "#define TCPCONN 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XRECORD 1 -+_ACEOF - -+ REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" -+ RECORD_LIB='$(top_builddir)/record/librecord.la' -+fi - -- # SVR4 hides these in libraries other than libc -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 --$as_echo_n "checking for library containing socket... " >&6; } --if test "${ac_cv_search_socket+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ if test "x$SCREENSAVER" = xyes; then -+ SCREENSAVER_TRUE= -+ SCREENSAVER_FALSE='#' - else -- ac_func_search_save_LIBS=$LIBS --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ SCREENSAVER_TRUE='#' -+ SCREENSAVER_FALSE= -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char socket (); --int --main () --{ --return socket (); -- ; -- return 0; --} -+if test "x$SCREENSAVER" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define SCREENSAVER 1 - _ACEOF --for ac_lib in '' socket; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_socket=$ac_res --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if test "${ac_cv_search_socket+set}" = set; then : -- break -+ -+ REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" - fi --done --if test "${ac_cv_search_socket+set}" = set; then : - -+ if test "x$RES" = xyes; then -+ RES_TRUE= -+ RES_FALSE='#' - else -- ac_cv_search_socket=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+ RES_TRUE='#' -+ RES_FALSE= - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 --$as_echo "$ac_cv_search_socket" >&6; } --ac_res=$ac_cv_search_socket --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+if test "x$RES" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define RES 1 -+_ACEOF -+ -+ REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 --$as_echo_n "checking for library containing gethostbyname... " >&6; } --if test "${ac_cv_search_gethostbyname+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+if test "x$GLX" = xyes; then - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char gethostbyname (); --int --main () --{ --return gethostbyname (); -- ; -- return 0; --} --_ACEOF --for ac_lib in '' nsl; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_gethostbyname=$ac_res -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5 -+$as_echo_n "checking for XLIB... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XLIB_CFLAGS"; then -+ pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "x11") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` -+else -+ pkg_failed=yes - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if test "${ac_cv_search_gethostbyname+set}" = set; then : -- break -+ fi -+else -+ pkg_failed=untried - fi --done --if test "${ac_cv_search_gethostbyname+set}" = set; then : -- -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XLIB_LIBS"; then -+ pkg_cv_XLIB_LIBS="$XLIB_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "x11") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` - else -- ac_cv_search_gethostbyname=no -+ pkg_failed=yes - fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+ fi -+else -+ pkg_failed=untried - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 --$as_echo "$ac_cv_search_gethostbyname" >&6; } --ac_res=$ac_cv_search_gethostbyname --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - --fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 --$as_echo_n "checking for main in -lws2_32... " >&6; } --if test "${ac_cv_lib_ws2_32_main+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lws2_32 $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - -+if test $pkg_failed = yes; then - --int --main () --{ --return main (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_ws2_32_main=yes -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- ac_cv_lib_ws2_32_main=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ _pkg_short_errors_supported=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 --$as_echo "$ac_cv_lib_ws2_32_main" >&6; } --if test "x$ac_cv_lib_ws2_32_main" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBWS2_32 1 --_ACEOF -+ if test $_pkg_short_errors_supported = yes; then -+ XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` -+ else -+ XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XLIB_PKG_ERRORS" >&5 - -- LIBS="-lws2_32 $LIBS" -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11) were not met: -+ -+$XLIB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XLIB_CFLAGS -+and XLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (x11) were not met: -+ -+$XLIB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XLIB_CFLAGS -+and XLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XLIB_CFLAGS -+and XLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XLIB_CFLAGS -+and XLIB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+else -+ XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS -+ XLIB_LIBS=$pkg_cv_XLIB_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : - fi --ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main - -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GL" >&5 -+$as_echo_n "checking for GL... " >&6; } - -- # Needs to come after above checks for libsocket & libnsl for SVR4 systems -- # Check whether --enable-ipv6 was given. --if test "${enable_ipv6+set}" = set; then : -- enableval=$enable_ipv6; IPV6CONN=$enableval -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GL_CFLAGS"; then -+ pkg_cv_GL_CFLAGS="$GL_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null` - else -- ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" --if test "x$ac_cv_func_getaddrinfo" = x""yes; then : -- IPV6CONN=yes -+ pkg_failed=yes -+fi -+ fi - else -- IPV6CONN=no -+ pkg_failed=untried - fi -- -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GL_LIBS"; then -+ pkg_cv_GL_LIBS="$GL_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 --$as_echo_n "checking if IPv6 support should be built... " >&6; } -- if test "$IPV6CONN" = "yes"; then - --$as_echo "#define IPv6 1" >>confdefs.h - -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 --$as_echo "$IPV6CONN" >&6; } -+if test $pkg_failed = yes; then - -- # 4.3BSD-Reno added a new member to struct sockaddr_in -- ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" " --#include --#include --#include -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -+ else -+ GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GL_PKG_ERRORS" >&5 - --" --if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then : -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBGL) were not met: - --$as_echo "#define BSD44SOCKETS 1" >>confdefs.h -+$GL_PKG_ERRORS - --fi -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+Alternatively, you may set the environment variables GL_CFLAGS -+and GL_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($GLPROTO $LIBGL) were not met: - -- # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. -- ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " --$ac_includes_default --#include --" --if test "x$ac_cv_type_socklen_t" = x""yes; then : -+$GL_PKG_ERRORS - --cat >>confdefs.h <<_ACEOF --#define HAVE_SOCKLEN_T 1 --_ACEOF -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+Alternatively, you may set the environment variables GL_CFLAGS -+and GL_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - --fi -+Alternatively, you may set the environment variables GL_CFLAGS -+and GL_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables GL_CFLAGS -+and GL_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -- fi -- case $host_os in -- solaris*|sco*|sysv4*) localdef="yes" ;; -- *) localdef="no" ;; -- esac -- # Check whether --enable-local-transport was given. --if test "${enable_local_transport+set}" = set; then : -- enableval=$enable_local_transport; LOCALCONN=$enableval -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- LOCALCONN=$localdef -+ GL_CFLAGS=$pkg_cv_GL_CFLAGS -+ GL_LIBS=$pkg_cv_GL_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 --$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 --$as_echo "$LOCALCONN" >&6; } -- if test "$LOCALCONN" = "yes"; then - --$as_echo "#define LOCALCONN 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define GLXEXT 1 -+_ACEOF - -- fi -+ GLX_LIBS='$(top_builddir)/glx/libglx.la' -+ GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" -+else -+ GLX=no -+fi -+ if test "x$GLX" = xyes; then -+ GLX_TRUE= -+ GLX_FALSE='#' -+else -+ GLX_TRUE='#' -+ GLX_FALSE= -+fi - - -+if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then - --# Secure RPC detection macro from xtrans.m4 -+cat >>confdefs.h <<\_ACEOF -+#define AIGLX 1 -+_ACEOF - -- # Check whether --enable-secure-rpc was given. --if test "${enable_secure_rpc+set}" = set; then : -- enableval=$enable_secure_rpc; SECURE_RPC=$enableval - else -- SECURE_RPC="try" -+ AIGLX=no -+fi -+ if test "x$AIGLX" = xyes; then -+ AIGLX_TRUE= -+ AIGLX_FALSE='#' -+else -+ AIGLX_TRUE='#' -+ AIGLX_FALSE= - fi - - -- if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then -- FOUND_SECURE_RPC="no" -- for ac_func in authdes_seccreate authdes_create --do : -- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" --eval as_val=\$$as_ac_var -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- FOUND_SECURE_RPC="yes" -+if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then -+ GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" -+ GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" - fi --done - -- if test "x$FOUND_SECURE_RPC" = "xno" ; then -- if test "x$SECURE_RPC" = "xyes" ; then -- as_fn_error "Secure RPC requested, but required functions not found" "$LINENO" 5 -- fi -- SECURE_RPC="no" -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getsecretkey" >&5 --$as_echo_n "checking for library containing getsecretkey... " >&6; } --if test "${ac_cv_search_getsecretkey+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ -+ if test "x$DRI" = xyes; then -+ DRI_TRUE= -+ DRI_FALSE='#' - else -- ac_func_search_save_LIBS=$LIBS --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ DRI_TRUE='#' -+ DRI_FALSE= -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char getsecretkey (); --int --main () --{ --return getsecretkey (); -- ; -- return 0; --} -+if test "x$DRI" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XF86DRI 1 - _ACEOF --for ac_lib in '' rpcsvc; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_search_getsecretkey=$ac_res -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for DRIPROTO" >&5 -+$as_echo_n "checking for DRIPROTO... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRIPROTO_CFLAGS"; then -+ pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRIPROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRIPROTO" 2>/dev/null` -+else -+ pkg_failed=yes - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext -- if test "${ac_cv_search_getsecretkey+set}" = set; then : -- break -+ fi -+else -+ pkg_failed=untried - fi --done --if test "${ac_cv_search_getsecretkey+set}" = set; then : -- -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRIPROTO_LIBS"; then -+ pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRIPROTO_LIBS=`$PKG_CONFIG --libs "$DRIPROTO" 2>/dev/null` - else -- ac_cv_search_getsecretkey=no -+ pkg_failed=yes - fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+ fi -+else -+ pkg_failed=untried - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getsecretkey" >&5 --$as_echo "$ac_cv_search_getsecretkey" >&6; } --ac_res=$ac_cv_search_getsecretkey --if test "$ac_res" != no; then : -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - --fi - -- SECURE_RPC="yes" -- fi -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 --$as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } -- if test "x$SECURE_RPC" = "xyes" ; then - --$as_echo "#define SECURE_RPC 1" >>confdefs.h -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"` -+ else -+ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$DRIPROTO_PKG_ERRORS" >&5 -+ -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($DRIPROTO) were not met: -+ -+$DRIPROTO_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DRIPROTO_CFLAGS -+and DRIPROTO_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($DRIPROTO) were not met: -+ -+$DRIPROTO_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DRIPROTO_CFLAGS -+and DRIPROTO_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables DRIPROTO_CFLAGS -+and DRIPROTO_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SECURE_RPC" >&5 --$as_echo "$SECURE_RPC" >&6; } -+Alternatively, you may set the environment variables DRIPROTO_CFLAGS -+and DRIPROTO_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -- if test "x$SECURE_RPC" = xyes; then -- SECURE_RPC_TRUE= -- SECURE_RPC_FALSE='#' -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- SECURE_RPC_TRUE='#' -- SECURE_RPC_FALSE= -+ DRIPROTO_CFLAGS=$pkg_cv_DRIPROTO_CFLAGS -+ DRIPROTO_LIBS=$pkg_cv_DRIPROTO_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : - fi - -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for DRI" >&5 -+$as_echo_n "checking for DRI... " >&6; } - -- if test "x$INT10" = xvm86; then -- INT10_VM86_TRUE= -- INT10_VM86_FALSE='#' -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRI_CFLAGS"; then -+ pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBDRI" 2>/dev/null` - else -- INT10_VM86_TRUE='#' -- INT10_VM86_FALSE= -+ pkg_failed=yes - fi -- -- if test "x$INT10" = xx86emu; then -- INT10_X86EMU_TRUE= -- INT10_X86EMU_FALSE='#' -+ fi - else -- INT10_X86EMU_TRUE='#' -- INT10_X86EMU_FALSE= -+ pkg_failed=untried - fi -- -- if test "x$INT10" = xstub; then -- INT10_STUB_TRUE= -- INT10_STUB_FALSE='#' -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRI_LIBS"; then -+ pkg_cv_DRI_LIBS="$DRI_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBDRI" 2>/dev/null` - else -- INT10_STUB_TRUE='#' -- INT10_STUB_FALSE= -+ pkg_failed=yes - fi -- --if test "x$INT10" = xyes; then -- for ac_header in sys/vm86.h sys/io.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- -+ fi -+else -+ pkg_failed=untried - fi - --done - --fi - -- if test "x$BUILDDOCS" = xyes; then -- BUILDDOCS_TRUE= -- BUILDDOCS_FALSE='#' -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- BUILDDOCS_TRUE='#' -- BUILDDOCS_FALSE= -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -+ else -+ DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$DRI_PKG_ERRORS" >&5 - -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBDRI) were not met: - -+$DRI_PKG_ERRORS - --if test x$XORG_SGML_PATH = x ; then -- XORG_SGML_PATH=$prefix/share/sgml --fi --HAVE_DEFS_ENT= -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - --if test x"$cross_compiling" = x"yes" ; then -- HAVE_DEFS_ENT=no --else -- as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XORG_SGML_PATH/X11/defs.ent" >&5 --$as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; } --if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : -- $as_echo_n "(cached) " >&6 --else -- test "$cross_compiling" = yes && -- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 --if test -r "$XORG_SGML_PATH/X11/defs.ent"; then -- eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi --fi --eval ac_res=\$$as_ac_File -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --eval as_val=\$$as_ac_File -- if test "x$as_val" = x""yes; then : -- HAVE_DEFS_ENT=yes --fi -+Alternatively, you may set the environment variables DRI_CFLAGS -+and DRI_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($GLPROTO $LIBDRI) were not met: - --fi -+$DRI_PKG_ERRORS - --# Extract the first word of "linuxdoc", so it can be a program name with args. --set dummy linuxdoc; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_LINUXDOC+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $LINUXDOC in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -- ;; --esac --fi --LINUXDOC=$ac_cv_path_LINUXDOC --if test -n "$LINUXDOC"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUXDOC" >&5 --$as_echo "$LINUXDOC" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -+Alternatively, you may set the environment variables DRI_CFLAGS -+and DRI_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables DRI_CFLAGS -+and DRI_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --# Extract the first word of "ps2pdf", so it can be a program name with args. --set dummy ps2pdf; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PS2PDF+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $PS2PDF in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -- ;; --esac --fi --PS2PDF=$ac_cv_path_PS2PDF --if test -n "$PS2PDF"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5 --$as_echo "$PS2PDF" >&6; } -+Alternatively, you may set the environment variables DRI_CFLAGS -+and DRI_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -+ DRI_CFLAGS=$pkg_cv_DRI_CFLAGS -+ DRI_LIBS=$pkg_cv_DRI_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : - fi - -+fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build documentation" >&5 --$as_echo_n "checking Whether to build documentation... " >&6; } -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for DRI2PROTO" >&5 -+$as_echo_n "checking for DRI2PROTO... " >&6; } - --if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then -- BUILDDOC=yes -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRI2PROTO_CFLAGS"; then -+ pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null` - else -- BUILDDOC=no -+ pkg_failed=yes - fi -- -- if test x$BUILDDOC = xyes; then -- BUILD_LINUXDOC_TRUE= -- BUILD_LINUXDOC_FALSE='#' -+ fi - else -- BUILD_LINUXDOC_TRUE='#' -- BUILD_LINUXDOC_FALSE= -+ pkg_failed=untried - fi -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDDOC" >&5 --$as_echo "$BUILDDOC" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build pdf documentation" >&5 --$as_echo_n "checking Whether to build pdf documentation... " >&6; } -- --if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then -- BUILDPDFDOC=yes -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DRI2PROTO_LIBS"; then -+ pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null` - else -- BUILDPDFDOC=no -+ pkg_failed=yes - fi -- -- if test x$BUILDPDFDOC = xyes; then -- BUILD_PDFDOC_TRUE= -- BUILD_PDFDOC_FALSE='#' -+ fi - else -- BUILD_PDFDOC_TRUE='#' -- BUILD_PDFDOC_FALSE= -+ pkg_failed=untried - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDPDFDOC" >&5 --$as_echo "$BUILDPDFDOC" >&6; } -- --MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" --MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" --MAKE_PDF="$PS2PDF" --MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" -- -- -- -- -- - -+if test $pkg_failed = yes; then - -- if test "x$INSTALL_LIBXF86CONFIG" = xyes; then -- INSTALL_LIBXF86CONFIG_TRUE= -- INSTALL_LIBXF86CONFIG_FALSE='#' -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- INSTALL_LIBXF86CONFIG_TRUE='#' -- INSTALL_LIBXF86CONFIG_FALSE= -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"` -+ else -+ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$DRI2PROTO_PKG_ERRORS" >&5 - -- --case $host_os in -- darwin*) -- DRI2=no -- -- if test x$XQUARTZ = xauto; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xquartz" >&5 --$as_echo_n "checking whether to build Xquartz... " >&6; } --if test "${xorg_cv_Carbon_framework+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- -- save_LDFLAGS=$LDFLAGS -- LDFLAGS="$LDFLAGS -framework Carbon" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --char FSFindFolder(); int main() { FSFindFolder(); return 0;} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- xorg_cv_Carbon_framework=yes -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_DRI2PROTO=no -+elif test $pkg_failed = untried; then -+ HAVE_DRI2PROTO=no - else -- xorg_cv_Carbon_framework=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -+ DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS -+ DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_DRI2PROTO=yes - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_Carbon_framework" >&5 --$as_echo "$xorg_cv_Carbon_framework" >&6; } -- -- if test "X$xorg_cv_Carbon_framework" = Xyes; then -- XQUARTZ=yes -- else -- XQUARTZ=no -- fi -- fi -+case "$DRI2,$HAVE_DRI2PROTO" in -+ yes,no) -+ { { $as_echo "$as_me:$LINENO: error: DRI2 requested, but dri2proto not found." >&5 -+$as_echo "$as_me: error: DRI2 requested, but dri2proto not found." >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ yes,yes | auto,yes) - -- if test "x$XQUARTZ" = xyes ; then -- XQUARTZ=yes -- XVFB=no -- XNEST=no -+cat >>confdefs.h <<\_ACEOF -+#define DRI2 1 -+_ACEOF - -- COMPOSITE=no -- DGA=no -- DPMSExtension=no -- XF86VIDMODE=no -- fi -+ DRI2=yes - ;; -- *) XQUARTZ=no ;; - esac -+ if test "x$DRI2" = xyes; then -+ DRI2_TRUE= -+ DRI2_FALSE='#' -+else -+ DRI2_TRUE='#' -+ DRI2_FALSE= -+fi - --XEXT_INC='-I$(top_srcdir)/Xext' --XEXT_LIB='$(top_builddir)/Xext/libXext.la' --XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' -- --VIDEOPROTO="videoproto" --COMPOSITEPROTO="compositeproto >= 0.4" --RECORDPROTO="recordproto >= 1.13.99.1" --SCRNSAVERPROTO="scrnsaverproto >= 1.1" --RESOURCEPROTO="resourceproto" --DRIPROTO="xf86driproto >= 2.1.0" --DRI2PROTO="dri2proto >= 2.1" --XINERAMAPROTO="xineramaproto" --BIGFONTPROTO="xf86bigfontproto >= 1.2.0" --XCALIBRATEPROTO="xcalibrateproto" --DGAPROTO="xf86dgaproto >= 2.0.99.1" --GLPROTO="glproto >= 1.4.9" --DMXPROTO="dmxproto >= 2.2.99.1" --VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" --WINDOWSWMPROTO="windowswmproto" --APPLEWMPROTO="applewmproto >= 1.4" -- --REQUIRED_MODULES="randrproto >= 1.2.99.3 renderproto >= 0.11 fixesproto >= 4.1 damageproto >= 1.1 xcmiscproto >= 1.2.0 xextproto >= 7.0.99.3 xproto >= 7.0.13 xtrans >= 1.2.2 bigreqsproto >= 1.1.0 fontsproto inputproto >= 1.9.99.902 kbproto >= 1.0.3" --REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20" -- --LIBAPPLEWM="applewm >= 1.4" --LIBDMX="dmx >= 1.0.99.1" --LIBDRI="dri >= 7.1.0" --LIBDRM="libdrm >= 2.3.0" --LIBGL="gl >= 7.1.0" --LIBXEXT="xext >= 1.0.99.4" --LIBXI="xi >= 1.2.99.1" --LIBXTST="xtst >= 1.0.99.2" --LIBPCIACCESS="pciaccess >= 0.8.0" --LIBGLIB="glib-2.0 >= 2.16" - -+if test "x$DRI" = xyes || test "x$DRI2" = xyes; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 --$as_echo_n "checking for DBUS... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for LIBDRM" >&5 -+$as_echo_n "checking for LIBDRM... " >&6; } - - if test -n "$PKG_CONFIG"; then -- if test -n "$DBUS_CFLAGS"; then -- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" -+ if test -n "$LIBDRM_CFLAGS"; then -+ pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -16392,16 +23404,16 @@ - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then -- if test -n "$DBUS_LIBS"; then -- pkg_cv_DBUS_LIBS="$DBUS_LIBS" -+ if test -n "$LIBDRM_LIBS"; then -+ pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -16420,219 +23432,592 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"` -+ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"` - else -- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` -+ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"` - fi - # Put the nasty error message in config.log where it belongs -- echo "$DBUS_PKG_ERRORS" >&5 -+ echo "$LIBDRM_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- HAVE_DBUS=no -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDRM) were not met: -+ -+$LIBDRM_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables LIBDRM_CFLAGS -+and LIBDRM_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBDRM) were not met: -+ -+$LIBDRM_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables LIBDRM_CFLAGS -+and LIBDRM_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- HAVE_DBUS=no -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables LIBDRM_CFLAGS -+and LIBDRM_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables LIBDRM_CFLAGS -+and LIBDRM_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS -- DBUS_LIBS=$pkg_cv_DBUS_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS -+ LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -- HAVE_DBUS=yes -+ : -+fi -+ -+ -+fi -+ -+if test "x$DRI2" = xyes; then -+ save_CFLAGS=$CFLAGS -+ CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#ifndef __DRI_DRI2 -+#error DRI2 extension not available. -+#endif -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ HAVE_DRI2EXTENSION=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ HAVE_DRI2EXTENSION=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$save_CFLAGS -+ if test "x$HAVE_DRI2EXTENSION" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define DRI2_AIGLX 1 -+_ACEOF -+ -+ DRI2_AIGLX=yes -+ else -+ { $as_echo "$as_me:$LINENO: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5 -+$as_echo "$as_me: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&6;} -+ DRI2_AIGLX=no -+ fi -+fi -+ if test "x$DRI2_AIGLX" = xyes; then -+ DRI2_AIGLX_TRUE= -+ DRI2_AIGLX_FALSE='#' -+else -+ DRI2_AIGLX_TRUE='#' -+ DRI2_AIGLX_FALSE= -+fi -+ -+ -+ -+ if test "x$XINERAMA" = xyes; then -+ XINERAMA_TRUE= -+ XINERAMA_FALSE='#' -+else -+ XINERAMA_TRUE='#' -+ XINERAMA_FALSE= - fi --if test "x$HAVE_DBUS" = xyes; then - --$as_echo "#define HAVE_DBUS 1" >>confdefs.h -+if test "x$XINERAMA" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XINERAMA 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define PANORAMIX 1 -+_ACEOF - -+ REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" - fi -- if test "x$HAVE_DBUS" = xyes; then -- HAVE_DBUS_TRUE= -- HAVE_DBUS_FALSE='#' -+ -+ if test "x$XACE" = xyes; then -+ XACE_TRUE= -+ XACE_FALSE='#' - else -- HAVE_DBUS_TRUE='#' -- HAVE_DBUS_FALSE= -+ XACE_TRUE='#' -+ XACE_FALSE= - fi - -+if test "x$XACE" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XACE 1 -+_ACEOF - --if test "x$CONFIG_DBUS_API" = xauto; then -- CONFIG_DBUS_API="$HAVE_DBUS" - fi --if test "x$CONFIG_DBUS_API" = xyes; then -- if ! test "x$HAVE_DBUS" = xyes; then -- as_fn_error "D-Bus configuration API requested, but D-Bus is not installed." "$LINENO" 5 -- fi - -+ if test "x$XSELINUX" = xyes; then -+ XSELINUX_TRUE= -+ XSELINUX_FALSE='#' -+else -+ XSELINUX_TRUE='#' -+ XSELINUX_FALSE= -+fi -+ -+if test "x$XSELINUX" = xyes; then -+ if test "x$XACE" != xyes; then -+ { { $as_echo "$as_me:$LINENO: error: cannot build SELinux extension without X-ACE" >&5 -+$as_echo "$as_me: error: cannot build SELinux extension without X-ACE" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - --$as_echo "#define CONFIG_DBUS_API 1" >>confdefs.h - -- CONFIG_NEED_DBUS="yes" -+for ac_header in selinux/selinux.h selinux/avc.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - fi -- if test "x$CONFIG_DBUS_API" = xyes; then -- CONFIG_DBUS_API_TRUE= -- CONFIG_DBUS_API_FALSE='#' -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- CONFIG_DBUS_API_TRUE='#' -- CONFIG_DBUS_API_FALSE= --fi -- -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5 --$as_echo_n "checking for HAL... " >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$HAL_CFLAGS"; then -- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "hal") 2>&5 -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- pkg_failed=yes -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi -- fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- pkg_failed=untried -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$HAL_LIBS"; then -- pkg_cv_HAL_LIBS="$HAL_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "hal") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` --else -- pkg_failed=yes -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ - fi -- fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ - else -- pkg_failed=untried -+ { { $as_echo "$as_me:$LINENO: error: SELinux include files not found" >&5 -+$as_echo "$as_me: error: SELinux include files not found" >&2;} -+ { (exit 1); exit 1; }; } - fi - -+done - - --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes -+{ $as_echo "$as_me:$LINENO: checking for avc_init in -lselinux" >&5 -+$as_echo_n "checking for avc_init in -lselinux... " >&6; } -+if test "${ac_cv_lib_selinux_avc_init+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"` -- else -- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$HAL_PKG_ERRORS" >&5 -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lselinux $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- HAVE_HAL=no --elif test $pkg_failed = untried; then -- HAVE_HAL=no -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char avc_init (); -+int -+main () -+{ -+return avc_init (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_selinux_avc_init=yes - else -- HAL_CFLAGS=$pkg_cv_HAL_CFLAGS -- HAL_LIBS=$pkg_cv_HAL_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- HAVE_HAL=yes --fi --if test "x$CONFIG_HAL" = xauto; then -- CONFIG_HAL="$HAVE_HAL" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_selinux_avc_init=no - fi --if test "x$CONFIG_HAL" = xyes; then -- if ! test "x$HAVE_HAL" = xyes; then -- as_fn_error "HAL hotplug API requested, but HAL is not installed." "$LINENO" 5 -- fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_avc_init" >&5 -+$as_echo "$ac_cv_lib_selinux_avc_init" >&6; } -+if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBSELINUX 1 -+_ACEOF - --$as_echo "#define CONFIG_HAL 1" >>confdefs.h -+ LIBS="-lselinux $LIBS" - -- REQUIRED_LIBS="$REQUIRED_LIBS hal" -- CONFIG_NEED_DBUS="yes" --fi -- if test "x$CONFIG_HAL" = xyes; then -- CONFIG_HAL_TRUE= -- CONFIG_HAL_FALSE='#' - else -- CONFIG_HAL_TRUE='#' -- CONFIG_HAL_FALSE= -+ { { $as_echo "$as_me:$LINENO: error: SELinux library not found" >&5 -+$as_echo "$as_me: error: SELinux library not found" >&2;} -+ { (exit 1); exit 1; }; } - fi - - --if test "x$CONFIG_NEED_DBUS" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" -- --$as_echo "#define CONFIG_NEED_DBUS 1" >>confdefs.h -+for ac_header in libaudit.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no - fi -- if test "x$CONFIG_NEED_DBUS" = xyes; then -- CONFIG_NEED_DBUS_TRUE= -- CONFIG_NEED_DBUS_FALSE='#' -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- CONFIG_NEED_DBUS_TRUE='#' -- CONFIG_NEED_DBUS_FALSE= -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi - --CONFIG_LIB='$(top_builddir)/config/libconfig.la' -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then -- USE_SIGIO_BY_DEFAULT_VALUE=TRUE -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- USE_SIGIO_BY_DEFAULT_VALUE=FALSE -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - --cat >>confdefs.h <<_ACEOF --#define USE_SIGIO_BY_DEFAULT $USE_SIGIO_BY_DEFAULT_VALUE -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc..." >&5 --$as_echo_n "checking for glibc...... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --#ifndef __GLIBC__ --#error --#endif -- --_ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -- glibc=yes - else -- glibc=no -+ { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system headers" >&5 -+$as_echo "$as_me: error: SELinux extension requires audit system headers" >&2;} -+ { (exit 1); exit 1; }; } - fi --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibc" >&5 --$as_echo "$glibc" >&6; } - --for ac_func in clock_gettime --do : -- ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" --if test "x$ac_cv_func_clock_gettime" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_CLOCK_GETTIME 1 --_ACEOF -- have_clock_gettime=yes --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 --$as_echo_n "checking for clock_gettime in -lrt... " >&6; } --if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : -+done -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for audit_open in -laudit" >&5 -+$as_echo_n "checking for audit_open in -laudit... " >&6; } -+if test "${ac_cv_lib_audit_audit_open+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lrt $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+LIBS="-laudit $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -16641,750 +24026,753 @@ - #ifdef __cplusplus - extern "C" - #endif --char clock_gettime (); -+char audit_open (); - int - main () - { --return clock_gettime (); -+return audit_open (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_rt_clock_gettime=yes --else -- ac_cv_lib_rt_clock_gettime=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 --$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } --if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : -- have_clock_gettime=-lrt -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_audit_audit_open=yes - else -- have_clock_gettime=no --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_lib_audit_audit_open=no - fi --done -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a useful monotonic clock ..." >&5 --$as_echo_n "checking for a useful monotonic clock ...... " >&6; } - --if ! test "x$have_clock_gettime" = xno; then -- if ! test "x$have_clock_gettime" = xyes; then -- CLOCK_LIBS="$have_clock_gettime" -- else -- CLOCK_LIBS="" -- fi -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audit_audit_open" >&5 -+$as_echo "$ac_cv_lib_audit_audit_open" >&6; } -+if test "x$ac_cv_lib_audit_audit_open" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBAUDIT 1 -+_ACEOF - -- LIBS_SAVE="$LIBS" -- LIBS="$CLOCK_LIBS" -- CPPFLAGS_SAVE="$CPPFLAGS" -+ LIBS="-laudit $LIBS" - -- if test x"$glibc" = xyes; then -- CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" -- fi -+else -+ { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system library" >&5 -+$as_echo "$as_me: error: SELinux extension requires audit system library" >&2;} -+ { (exit 1); exit 1; }; } -+fi - -- if test "$cross_compiling" = yes; then : -- MONOTONIC_CLOCK="cross compiling" -+ { $as_echo "$as_me:$LINENO: checking whether avc_netlink_acquire_fd is declared" >&5 -+$as_echo_n "checking whether avc_netlink_acquire_fd is declared... " >&6; } -+if test "${ac_cv_have_decl_avc_netlink_acquire_fd+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include - --#include -- --int main(int argc, char *argv[]) { -- struct timespec tp; -+int -+main () -+{ -+#ifndef avc_netlink_acquire_fd -+ (void) avc_netlink_acquire_fd; -+#endif - -- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -- return 0; -- else -- return 1; -+ ; -+ return 0; - } -- - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- MONOTONIC_CLOCK=yes --else -- MONOTONIC_CLOCK=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- -- LIBS="$LIBS_SAVE" -- CPPFLAGS="$CPPFLAGS_SAVE" --else -- MONOTONIC_CLOCK=no --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONOTONIC_CLOCK" >&5 --$as_echo "$MONOTONIC_CLOCK" >&6; } -- --if test "x$MONOTONIC_CLOCK" = xyes; then -- --$as_echo "#define MONOTONIC_CLOCK 1" >>confdefs.h -- -- LIBS="$LIBS $CLOCK_LIBS" --fi -- -- if test "x$XV" = xyes; then -- XV_TRUE= -- XV_FALSE='#' -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl_avc_netlink_acquire_fd=yes - else -- XV_TRUE='#' -- XV_FALSE= --fi -- --if test "x$XV" = xyes; then -- --$as_echo "#define XV 1" >>confdefs.h -- -- --$as_echo "#define XvExtension 1" >>confdefs.h -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" --else -- XVMC=no -+ ac_cv_have_decl_avc_netlink_acquire_fd=no - fi - -- if test "x$XVMC" = xyes; then -- XVMC_TRUE= -- XVMC_FALSE='#' --else -- XVMC_TRUE='#' -- XVMC_FALSE= -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_avc_netlink_acquire_fd" >&5 -+$as_echo "$ac_cv_have_decl_avc_netlink_acquire_fd" >&6; } -+if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then - --if test "x$XVMC" = xyes; then -- --$as_echo "#define XvMCExtension 1" >>confdefs.h -- --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_AVC_NETLINK_ACQUIRE_FD 1 -+_ACEOF - -- if test "x$XREGISTRY" = xyes; then -- XREGISTRY_TRUE= -- XREGISTRY_FALSE='#' --else -- XREGISTRY_TRUE='#' -- XREGISTRY_FALSE= - fi - --if test "x$XREGISTRY" = xyes; then - --$as_echo "#define XREGISTRY 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XSELINUX 1 -+_ACEOF - -+ SELINUX_LIB="-lselinux -laudit" - fi - -- if test "x$COMPOSITE" = xyes; then -- COMPOSITE_TRUE= -- COMPOSITE_FALSE='#' -+ if test "x$XCSECURITY" = xyes; then -+ XCSECURITY_TRUE= -+ XCSECURITY_FALSE='#' - else -- COMPOSITE_TRUE='#' -- COMPOSITE_FALSE= -+ XCSECURITY_TRUE='#' -+ XCSECURITY_FALSE= - fi - --if test "x$COMPOSITE" = xyes; then -+if test "x$XCSECURITY" = xyes; then -+ if test "x$XACE" != xyes; then -+ { { $as_echo "$as_me:$LINENO: error: cannot build Security extension without X-ACE" >&5 -+$as_echo "$as_me: error: cannot build Security extension without X-ACE" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - --$as_echo "#define COMPOSITE 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XCSECURITY 1 -+_ACEOF - -- REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" -- COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' -- COMPOSITE_INC='-I$(top_srcdir)/composite' - fi - -- if test "x$MITSHM" = xyes; then -- MITSHM_TRUE= -- MITSHM_FALSE='#' -+ if test "x$MULTIBUFFER" = xyes; then -+ MULTIBUFFER_TRUE= -+ MULTIBUFFER_FALSE='#' - else -- MITSHM_TRUE='#' -- MITSHM_FALSE= -+ MULTIBUFFER_TRUE='#' -+ MULTIBUFFER_FALSE= - fi - --if test "x$MITSHM" = xyes; then -- --$as_echo "#define MITSHM 1" >>confdefs.h -- -+if test "x$MULTIBUFFER" = xyes; then - --$as_echo "#define HAS_SHM 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define MULTIBUFFER 1 -+_ACEOF - -+ # Requires xextproto which is always required - fi - -- if test "x$RECORD" = xyes; then -- RECORD_TRUE= -- RECORD_FALSE='#' -+ if test "x$DBE" = xyes; then -+ DBE_TRUE= -+ DBE_FALSE='#' - else -- RECORD_TRUE='#' -- RECORD_FALSE= -+ DBE_TRUE='#' -+ DBE_FALSE= - fi - --if test "x$RECORD" = xyes; then -+if test "x$DBE" = xyes; then - --$as_echo "#define XRECORD 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define DBE 1 -+_ACEOF - -- REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" -- RECORD_LIB='$(top_builddir)/record/librecord.la' -+ DBE_LIB='$(top_builddir)/dbe/libdbe.la' - fi - -- if test "x$SCREENSAVER" = xyes; then -- SCREENSAVER_TRUE= -- SCREENSAVER_FALSE='#' -+ if test "x$XF86BIGFONT" = xyes; then -+ XF86BIGFONT_TRUE= -+ XF86BIGFONT_FALSE='#' - else -- SCREENSAVER_TRUE='#' -- SCREENSAVER_FALSE= -+ XF86BIGFONT_TRUE='#' -+ XF86BIGFONT_FALSE= - fi - --if test "x$SCREENSAVER" = xyes; then -+if test "x$XF86BIGFONT" = xyes; then - --$as_echo "#define SCREENSAVER 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XF86BIGFONT 1 -+_ACEOF - -- REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" -+ REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" - fi - -- if test "x$RES" = xyes; then -- RES_TRUE= -- RES_FALSE='#' -+ if test "x$DPMSExtension" = xyes; then -+ DPMSExtension_TRUE= -+ DPMSExtension_FALSE='#' - else -- RES_TRUE='#' -- RES_FALSE= -+ DPMSExtension_TRUE='#' -+ DPMSExtension_FALSE= - fi - --if test "x$RES" = xyes; then -+if test "x$DPMSExtension" = xyes; then - --$as_echo "#define RES 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define DPMSExtension 1 -+_ACEOF - -- REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" - fi - --if test "x$GLX" = xyes; then -+if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5 --$as_echo_n "checking for XLIB... " >&6; } -+cat >>confdefs.h <<\_ACEOF -+#define XCALIBRATE 1 -+_ACEOF - --if test -n "$PKG_CONFIG"; then -- if test -n "$XLIB_CFLAGS"; then -- pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "x11") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XLIB_LIBS"; then -- pkg_cv_XLIB_LIBS="$XLIB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "x11") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` -+ REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO" - else -- pkg_failed=yes -+ XCALIBRATE=no - fi -- fi -+ if test "x$XCALIBRATE" = xyes; then -+ XCALIBRATE_TRUE= -+ XCALIBRATE_FALSE='#' - else -- pkg_failed=untried -+ XCALIBRATE_TRUE='#' -+ XCALIBRATE_FALSE= - fi - - - --if test $pkg_failed = yes; then -+cat >>confdefs.h <<\_ACEOF -+#define RENDER 1 -+_ACEOF - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` -- else -- XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XLIB_PKG_ERRORS" >&5 -+RENDER_LIB='$(top_builddir)/render/librender.la' -+RENDER_INC='-I$(top_srcdir)/render' - -- as_fn_error "Package requirements (x11) were not met: - --$XLIB_PKG_ERRORS -+cat >>confdefs.h <<\_ACEOF -+#define RANDR 1 -+_ACEOF - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+RANDR_LIB='$(top_builddir)/randr/librandr.la' -+RANDR_INC='-I$(top_srcdir)/randr' - --Alternatively, you may set the environment variables XLIB_CFLAGS --and XLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. - --Alternatively, you may set the environment variables XLIB_CFLAGS --and XLIB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+cat >>confdefs.h <<\_ACEOF -+#define XFIXES 1 -+_ACEOF - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' -+FIXES_INC='-I$(top_srcdir)/xfixes' -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define DAMAGE 1 -+_ACEOF -+ -+DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' -+DAMAGE_INC='-I$(top_srcdir)/damageext' -+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 -+XI_LIB='$(top_builddir)/Xi/libXi.la' -+XI_INC='-I$(top_srcdir)/Xi' -+ -+ if test "x$XF86UTILS" = xyes; then -+ XF86UTILS_TRUE= -+ XF86UTILS_FALSE='#' - else -- XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS -- XLIB_LIBS=$pkg_cv_XLIB_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : -+ XF86UTILS_TRUE='#' -+ XF86UTILS_FALSE= - fi - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5 --$as_echo_n "checking for GL... " >&6; } -- --if test -n "$PKG_CONFIG"; then -- if test -n "$GL_CFLAGS"; then -- pkg_cv_GL_CFLAGS="$GL_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null` -+ if test "x$XAA" = xyes; then -+ XAA_TRUE= -+ XAA_FALSE='#' - else -- pkg_failed=yes -+ XAA_TRUE='#' -+ XAA_FALSE= - fi -- fi -+ -+ if test "x$VGAHW" = xyes; then -+ VGAHW_TRUE= -+ VGAHW_FALSE='#' - else -- pkg_failed=untried -+ VGAHW_TRUE='#' -+ VGAHW_FALSE= - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$GL_LIBS"; then -- pkg_cv_GL_LIBS="$GL_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null` -+ -+ if test "x$VBE" = xyes; then -+ VBE_TRUE= -+ VBE_FALSE='#' - else -- pkg_failed=yes -+ VBE_TRUE='#' -+ VBE_FALSE= - fi -- fi -+ -+ if test "x$INT10MODULE" = xyes; then -+ INT10MODULE_TRUE= -+ INT10MODULE_FALSE='#' - else -- pkg_failed=untried -+ INT10MODULE_TRUE='#' -+ INT10MODULE_FALSE= - fi - - - --if test $pkg_failed = yes; then -+cat >>confdefs.h <<\_ACEOF -+#define SHAPE 1 -+_ACEOF - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -- else -- GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GL_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($GLPROTO $LIBGL) were not met: - --$GL_PKG_ERRORS -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$XKBPATH\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ XKB_BASE_DIRECTORY="$ac_define_dir" - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. - --Alternatively, you may set the environment variables GL_CFLAGS --and GL_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+cat >>confdefs.h <<_ACEOF -+#define XKB_BASE_DIRECTORY "$ac_define_dir" -+_ACEOF - --Alternatively, you may set the environment variables GL_CFLAGS --and GL_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+ -+# Check whether --with-xkb-bin-directory was given. -+if test "${with_xkb_bin_directory+set}" = set; then -+ withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval" - else -- GL_CFLAGS=$pkg_cv_GL_CFLAGS -- GL_LIBS=$pkg_cv_GL_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : -+ XKB_BIN_DIRECTORY="$bindir" - fi - - --$as_echo "#define GLXEXT 1" >>confdefs.h - -- GLX_LIBS='$(top_builddir)/glx/libglx.la' -- GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" --else -- GLX=no --fi -- if test "x$GLX" = xyes; then -- GLX_TRUE= -- GLX_FALSE='#' --else -- GLX_TRUE='#' -- GLX_FALSE= --fi -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$XKB_BIN_DIRECTORY\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ XKB_BIN_DIRECTORY="$ac_define_dir" - --if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then -+cat >>confdefs.h <<_ACEOF -+#define XKB_BIN_DIRECTORY "$ac_define_dir" -+_ACEOF --$as_echo "#define AIGLX 1" >>confdefs.h -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE +@@ -25279,7 +25279,9 @@ --else -- AIGLX=no --fi -- if test "x$AIGLX" = xyes; then -- AIGLX_TRUE= -- AIGLX_FALSE='#' --else -- AIGLX_TRUE='#' -- AIGLX_FALSE= -+ -+XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` -+if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then + XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` + if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then +- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" + { { $as_echo "$as_me:$LINENO: error: xkb-output must be an absolute path." >&5 +$as_echo "$as_me: error: xkb-output must be an absolute path." >&2;} + { (exit 1); exit 1; }; } fi --if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then -- GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" -- GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" --fi -+XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` -+XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` -+ -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$XKBOUTPUT\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ XKM_OUTPUT_DIR="$ac_define_dir" -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define XKM_OUTPUT_DIR "$ac_define_dir" -+_ACEOF -+ -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - - -- if test "x$DRI" = xyes; then -- DRI_TRUE= -- DRI_FALSE='#' --else -- DRI_TRUE='#' -- DRI_FALSE= -+ -+if test "x$XKB_DFLT_RULES" = x; then -+ case $host_os in -+ linux*) -+ if test "x$CONFIG_HAL" = xyes; then -+ XKB_DFLT_RULES="evdev" -+ else -+ XKB_DFLT_RULES="base" -+ fi -+ ;; -+ *) -+ XKB_DFLT_RULES="base" -+ ;; -+ esac - fi - --if test "x$DRI" = xyes; then -+cat >>confdefs.h <<_ACEOF -+#define XKB_DFLT_RULES "$XKB_DFLT_RULES" -+_ACEOF - --$as_echo "#define XF86DRI 1" >>confdefs.h - -+cat >>confdefs.h <<_ACEOF -+#define XKB_DFLT_MODEL "$XKB_DFLT_MODEL" -+_ACEOF - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRIPROTO" >&5 --$as_echo_n "checking for DRIPROTO... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DRIPROTO_CFLAGS"; then -- pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRIPROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRIPROTO" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRIPROTO_LIBS"; then -- pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRIPROTO_LIBS=`$PKG_CONFIG --libs "$DRIPROTO" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi -+cat >>confdefs.h <<_ACEOF -+#define XKB_DFLT_LAYOUT "$XKB_DFLT_LAYOUT" -+_ACEOF - - -+cat >>confdefs.h <<_ACEOF -+#define XKB_DFLT_VARIANT "$XKB_DFLT_VARIANT" -+_ACEOF - --if test $pkg_failed = yes; then - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"` -- else -- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$DRIPROTO_PKG_ERRORS" >&5 -+cat >>confdefs.h <<_ACEOF -+#define XKB_DFLT_OPTIONS "$XKB_DFLT_OPTIONS" -+_ACEOF - -- as_fn_error "Package requirements ($DRIPROTO) were not met: - --$DRIPROTO_PKG_ERRORS -+XKB_LIB='$(top_builddir)/xkb/libxkb.la' -+XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+{ $as_echo "$as_me:$LINENO: checking for strcasecmp" >&5 -+$as_echo_n "checking for strcasecmp... " >&6; } -+if test "${ac_cv_func_strcasecmp+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define strcasecmp to an innocuous variant, in case declares strcasecmp. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define strcasecmp innocuous_strcasecmp - --Alternatively, you may set the environment variables DRIPROTO_CFLAGS --and DRIPROTO_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char strcasecmp (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --Alternatively, you may set the environment variables DRIPROTO_CFLAGS --and DRIPROTO_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } --else -- DRIPROTO_CFLAGS=$pkg_cv_DRIPROTO_CFLAGS -- DRIPROTO_LIBS=$pkg_cv_DRIPROTO_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : --fi -+#undef strcasecmp - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5 --$as_echo_n "checking for DRI... " >&6; } -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strcasecmp (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_strcasecmp || defined __stub___strcasecmp -+choke me -+#endif - --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI_CFLAGS"; then -- pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 -+int -+main () -+{ -+return strcasecmp (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBDRI" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_strcasecmp=yes - else -- pkg_failed=untried -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_strcasecmp=no - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI_LIBS"; then -- pkg_cv_DRI_LIBS="$DRI_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBDRI" 2>/dev/null` --else -- pkg_failed=yes -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -- fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5 -+$as_echo "$ac_cv_func_strcasecmp" >&6; } -+if test "x$ac_cv_func_strcasecmp" = x""yes; then -+ : - else -- pkg_failed=untried --fi -- - -+cat >>confdefs.h <<\_ACEOF -+#define NEED_STRCASECMP 1 -+_ACEOF - --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no - fi -- if test $_pkg_short_errors_supported = yes; then -- DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -- else -- DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$DRI_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($GLPROTO $LIBDRI) were not met: -+{ $as_echo "$as_me:$LINENO: checking for strncasecmp" >&5 -+$as_echo_n "checking for strncasecmp... " >&6; } -+if test "${ac_cv_func_strncasecmp+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define strncasecmp to an innocuous variant, in case declares strncasecmp. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define strncasecmp innocuous_strncasecmp - --$DRI_PKG_ERRORS -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char strncasecmp (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --Alternatively, you may set the environment variables DRI_CFLAGS --and DRI_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+#undef strncasecmp - --Alternatively, you may set the environment variables DRI_CFLAGS --and DRI_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strncasecmp (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_strncasecmp || defined __stub___strncasecmp -+choke me -+#endif - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+int -+main () -+{ -+return strncasecmp (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_strncasecmp=yes - else -- DRI_CFLAGS=$pkg_cv_DRI_CFLAGS -- DRI_LIBS=$pkg_cv_DRI_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_strncasecmp=no - fi - -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI2PROTO" >&5 --$as_echo_n "checking for DRI2PROTO... " >&6; } -- --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI2PROTO_CFLAGS"; then -- pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI2PROTO_LIBS"; then -- pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null` -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strncasecmp" >&5 -+$as_echo "$ac_cv_func_strncasecmp" >&6; } -+if test "x$ac_cv_func_strncasecmp" = x""yes; then -+ : - else -- pkg_failed=yes -+ -+cat >>confdefs.h <<\_ACEOF -+#define NEED_STRNCASECMP 1 -+_ACEOF -+ - fi -- fi -+ -+{ $as_echo "$as_me:$LINENO: checking for strcasestr" >&5 -+$as_echo_n "checking for strcasestr... " >&6; } -+if test "${ac_cv_func_strcasestr+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- pkg_failed=untried --fi -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define strcasestr to an innocuous variant, in case declares strcasestr. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define strcasestr innocuous_strcasestr - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char strcasestr (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --if test $pkg_failed = yes; then -+#undef strcasestr - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strcasestr (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_strcasestr || defined __stub___strcasestr -+choke me -+#endif -+ -+int -+main () -+{ -+return strcasestr (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_strcasestr=yes - else -- _pkg_short_errors_supported=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_strcasestr=no - fi -- if test $_pkg_short_errors_supported = yes; then -- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"` -- else -- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$DRI2PROTO_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- HAVE_DRI2PROTO=no --elif test $pkg_failed = untried; then -- HAVE_DRI2PROTO=no --else -- DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS -- DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- HAVE_DRI2PROTO=yes -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --case "$DRI2,$HAVE_DRI2PROTO" in -- yes,no) -- as_fn_error "DRI2 requested, but dri2proto not found." "$LINENO" 5 -- ;; -- yes,yes | auto,yes) -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcasestr" >&5 -+$as_echo "$ac_cv_func_strcasestr" >&6; } -+if test "x$ac_cv_func_strcasestr" = x""yes; then -+ : -+else - --$as_echo "#define DRI2 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define NEED_STRCASESTR 1 -+_ACEOF - -- DRI2=yes -- ;; --esac -- if test "x$DRI2" = xyes; then -- DRI2_TRUE= -- DRI2_FALSE='#' --else -- DRI2_TRUE='#' -- DRI2_FALSE= - fi - - --if test "x$DRI" = xyes || test "x$DRI2" = xyes; then -+if test "x$NULL_ROOT_CURSOR" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define NULL_ROOT_CURSOR 1 -+_ACEOF -+ -+fi -+ - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM" >&5 --$as_echo_n "checking for LIBDRM... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for XDMCP" >&5 -+$as_echo_n "checking for XDMCP... " >&6; } - - if test -n "$PKG_CONFIG"; then -- if test -n "$LIBDRM_CFLAGS"; then -- pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" -+ if test -n "$XDMCP_CFLAGS"; then -+ pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -17393,16 +24781,16 @@ - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then -- if test -n "$LIBDRM_LIBS"; then -- pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" -+ if test -n "$XDMCP_LIBS"; then -+ pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -17418,158 +24806,41 @@ - if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes - else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"` -- else -- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBDRM_PKG_ERRORS" >&5 -- -- as_fn_error "Package requirements ($LIBDRM) were not met: -- --$LIBDRM_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables LIBDRM_CFLAGS --and LIBDRM_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables LIBDRM_CFLAGS --and LIBDRM_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } --else -- LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS -- LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : --fi -- -- --fi -- --if test "x$DRI2" = xyes; then -- save_CFLAGS=$CFLAGS -- CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include --#ifndef __DRI_DRI2 --#error DRI2 extension not available. --#endif --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- HAVE_DRI2EXTENSION=yes --else -- HAVE_DRI2EXTENSION=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$save_CFLAGS -- if test "x$HAVE_DRI2EXTENSION" = xyes; then -- --$as_echo "#define DRI2_AIGLX 1" >>confdefs.h -- -- DRI2_AIGLX=yes -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5 --$as_echo "$as_me: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&6;} -- DRI2_AIGLX=no -- fi --fi -- if test "x$DRI2_AIGLX" = xyes; then -- DRI2_AIGLX_TRUE= -- DRI2_AIGLX_FALSE='#' --else -- DRI2_AIGLX_TRUE='#' -- DRI2_AIGLX_FALSE= --fi -- -- -- -- if test "x$XINERAMA" = xyes; then -- XINERAMA_TRUE= -- XINERAMA_FALSE='#' --else -- XINERAMA_TRUE='#' -- XINERAMA_FALSE= --fi -- --if test "x$XINERAMA" = xyes; then -- --$as_echo "#define XINERAMA 1" >>confdefs.h -- -- --$as_echo "#define PANORAMIX 1" >>confdefs.h -- -- REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" --fi -- -- if test "x$XACE" = xyes; then -- XACE_TRUE= -- XACE_FALSE='#' --else -- XACE_TRUE='#' -- XACE_FALSE= --fi -- --if test "x$XACE" = xyes; then -- --$as_echo "#define XACE 1" >>confdefs.h -- --fi -- -- if test "x$XSELINUX" = xyes; then -- XSELINUX_TRUE= -- XSELINUX_FALSE='#' --else -- XSELINUX_TRUE='#' -- XSELINUX_FALSE= -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` -+ else -+ XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XDMCP_PKG_ERRORS" >&5 - --if test "x$XSELINUX" = xyes; then -- if test "x$XACE" != xyes; then -- as_fn_error "cannot build SELinux extension without X-ACE" "$LINENO" 5 -- fi -- for ac_header in selinux/selinux.h selinux/avc.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ have_libxdmcp="no" -+elif test $pkg_failed = untried; then -+ have_libxdmcp="no" - else -- as_fn_error "SELinux include files not found" "$LINENO" 5 -+ XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS -+ XDMCP_LIBS=$pkg_cv_XDMCP_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ have_libxdmcp="yes" - fi -- --done -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avc_init in -lselinux" >&5 --$as_echo_n "checking for avc_init in -lselinux... " >&6; } --if test "${ac_cv_lib_selinux_avc_init+set}" = set; then : -+if test "x$have_libxdmcp" = xyes; then -+ { $as_echo "$as_me:$LINENO: checking for XdmcpWrap in -lXdmcp" >&5 -+$as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; } -+if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lselinux $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+LIBS="-lXdmcp $XDMCP_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -17578,509 +24849,615 @@ - #ifdef __cplusplus - extern "C" - #endif --char avc_init (); -+char XdmcpWrap (); - int - main () - { --return avc_init (); -+return XdmcpWrap (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_selinux_avc_init=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_Xdmcp_XdmcpWrap=yes - else -- ac_cv_lib_selinux_avc_init=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_Xdmcp_XdmcpWrap=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_avc_init" >&5 --$as_echo "$ac_cv_lib_selinux_avc_init" >&6; } --if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBSELINUX 1 --_ACEOF -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5 -+$as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; } -+if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then -+ have_xdmcpwrap="yes" -+else -+ have_xdmcpwrap="no" -+fi - -- LIBS="-lselinux $LIBS" -+fi -+if test "x$XDMCP" = xauto; then -+ if test "x$have_libxdmcp" = xyes; then -+ XDMCP=yes -+ else -+ XDMCP=no -+ fi -+fi -+if test "x$XDMAUTH" = xauto; then -+ if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then -+ XDMAUTH=yes -+ else -+ XDMAUTH=no -+ fi -+fi - -+ if test "x$XDMCP" = xyes; then -+ XDMCP_TRUE= -+ XDMCP_FALSE='#' - else -- as_fn_error "SELinux library not found" "$LINENO" 5 -+ XDMCP_TRUE='#' -+ XDMCP_FALSE= - fi - -- for ac_header in libaudit.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default" --if test "x$ac_cv_header_libaudit_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBAUDIT_H 1 -+if test "x$XDMCP" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define XDMCP 1 - _ACEOF - --else -- as_fn_error "SELinux extension requires audit system headers" "$LINENO" 5 -+ REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" -+ XDMCP_MODULES="xdmcp" - fi - --done -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5 --$as_echo_n "checking for audit_open in -laudit... " >&6; } --if test "${ac_cv_lib_audit_audit_open+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ if test "x$XDMAUTH" = xyes; then -+ XDMAUTH_TRUE= -+ XDMAUTH_FALSE='#' - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-laudit $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ XDMAUTH_TRUE='#' -+ XDMAUTH_FALSE= -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char audit_open (); --int --main () --{ --return audit_open (); -- ; -- return 0; --} -+if test "x$XDMAUTH" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HASXDMAUTH 1 - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_audit_audit_open=yes --else -- ac_cv_lib_audit_audit_open=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ -+ if ! test "x$XDMCP" = xyes; then -+ REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" -+ XDMCP_MODULES="xdmcp" -+ fi - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5 --$as_echo "$ac_cv_lib_audit_audit_open" >&6; } --if test "x$ac_cv_lib_audit_audit_open" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBAUDIT 1 -+ -+ -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$FONTPATH\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ COMPILEDDEFAULTFONTPATH="$ac_define_dir" -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define COMPILEDDEFAULTFONTPATH "$ac_define_dir" - _ACEOF - -- LIBS="-laudit $LIBS" -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - --else -- as_fn_error "SELinux extension requires audit system library" "$LINENO" 5 --fi - -- ac_fn_c_check_decl "$LINENO" "avc_netlink_acquire_fd" "ac_cv_have_decl_avc_netlink_acquire_fd" "#include --" --if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then : -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$PCI_TXT_IDS_DIR\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ PCI_TXT_IDS_PATH="$ac_define_dir" - --$as_echo "#define HAVE_AVC_NETLINK_ACQUIRE_FD 1" >>confdefs.h - --fi -+cat >>confdefs.h <<_ACEOF -+#define PCI_TXT_IDS_PATH "$ac_define_dir" -+_ACEOF - -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - --$as_echo "#define XSELINUX 1" >>confdefs.h - -- SELINUX_LIB="-lselinux -laudit" --fi -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$SERVERCONFIG\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ SERVER_MISC_CONFIG_PATH="$ac_define_dir" - -- if test "x$XCSECURITY" = xyes; then -- XCSECURITY_TRUE= -- XCSECURITY_FALSE='#' --else -- XCSECURITY_TRUE='#' -- XCSECURITY_FALSE= --fi - --if test "x$XCSECURITY" = xyes; then -- if test "x$XACE" != xyes; then -- as_fn_error "cannot build Security extension without X-ACE" "$LINENO" 5 -- fi -+cat >>confdefs.h <<_ACEOF -+#define SERVER_MISC_CONFIG_PATH "$ac_define_dir" -+_ACEOF - --$as_echo "#define XCSECURITY 1" >>confdefs.h -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - --fi - -- if test "x$MULTIBUFFER" = xyes; then -- MULTIBUFFER_TRUE= -- MULTIBUFFER_FALSE='#' --else -- MULTIBUFFER_TRUE='#' -- MULTIBUFFER_FALSE= --fi -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$FONTDIR\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ BASE_FONT_PATH="$ac_define_dir" - --if test "x$MULTIBUFFER" = xyes; then - --$as_echo "#define MULTIBUFFER 1" >>confdefs.h -+cat >>confdefs.h <<_ACEOF -+#define BASE_FONT_PATH "$ac_define_dir" -+_ACEOF - -- # Requires xextproto which is always required --fi -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE - -- if test "x$DBE" = xyes; then -- DBE_TRUE= -- DBE_FALSE='#' --else -- DBE_TRUE='#' -- DBE_FALSE= --fi - --if test "x$DBE" = xyes; then -+ prefix_NONE= -+ exec_prefix_NONE= -+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -+ eval ac_define_dir="\"$DRI_DRIVER_PATH\"" -+ eval ac_define_dir="\"$ac_define_dir\"" -+ DRI_DRIVER_PATH="$ac_define_dir" - --$as_echo "#define DBE 1" >>confdefs.h - -- DBE_LIB='$(top_builddir)/dbe/libdbe.la' --fi -+cat >>confdefs.h <<_ACEOF -+#define DRI_DRIVER_PATH "$ac_define_dir" -+_ACEOF -+ -+ test "$prefix_NONE" && prefix=NONE -+ test "$exec_prefix_NONE" && exec_prefix=NONE -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define XVENDORNAME "$VENDOR_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define XVENDORNAMESHORT "$VENDOR_NAME_SHORT" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define XORG_DATE "$RELEASE_DATE" -+_ACEOF - -- if test "x$XF86BIGFONT" = xyes; then -- XF86BIGFONT_TRUE= -- XF86BIGFONT_FALSE='#' --else -- XF86BIGFONT_TRUE='#' -- XF86BIGFONT_FALSE= --fi - --if test "x$XF86BIGFONT" = xyes; then -+cat >>confdefs.h <<_ACEOF -+#define XORG_MAN_VERSION "$VENDOR_MAN_VERSION" -+_ACEOF - --$as_echo "#define XF86BIGFONT 1" >>confdefs.h - -- REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" --fi -+cat >>confdefs.h <<_ACEOF -+#define BUILDERADDR "$BUILDERADDR" -+_ACEOF - -- if test "x$DPMSExtension" = xyes; then -- DPMSExtension_TRUE= -- DPMSExtension_FALSE='#' --else -- DPMSExtension_TRUE='#' -- DPMSExtension_FALSE= -+ -+if test -z "$OSNAME"; then -+ OSNAME="UNKNOWN" - fi - --if test "x$DPMSExtension" = xyes; then - --$as_echo "#define DPMSExtension 1" >>confdefs.h -+cat >>confdefs.h <<_ACEOF -+#define OSNAME "$OSNAME" -+_ACEOF - --fi - --if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then -+cat >>confdefs.h <<_ACEOF -+#define OSVENDOR "$OSVENDOR" -+_ACEOF - --$as_echo "#define XCALIBRATE 1" >>confdefs.h - -- REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO" --else -- XCALIBRATE=no --fi -- if test "x$XCALIBRATE" = xyes; then -- XCALIBRATE_TRUE= -- XCALIBRATE_FALSE='#' --else -- XCALIBRATE_TRUE='#' -- XCALIBRATE_FALSE= --fi -+cat >>confdefs.h <<_ACEOF -+#define BUILDERSTRING "$BUILDERSTRING" -+_ACEOF - - - --$as_echo "#define RENDER 1" >>confdefs.h - --RENDER_LIB='$(top_builddir)/render/librender.la' --RENDER_INC='-I$(top_srcdir)/render' -+cat >>confdefs.h <<_ACEOF -+#define VENDOR_NAME "$VENDOR_NAME" -+_ACEOF - - --$as_echo "#define RANDR 1" >>confdefs.h -+cat >>confdefs.h <<_ACEOF -+#define VENDOR_NAME_SHORT "$VENDOR_NAME_SHORT" -+_ACEOF - --RANDR_LIB='$(top_builddir)/randr/librandr.la' --RANDR_INC='-I$(top_srcdir)/randr' - -+cat >>confdefs.h <<_ACEOF -+#define VENDOR_RELEASE $VENDOR_RELEASE -+_ACEOF - --$as_echo "#define XFIXES 1" >>confdefs.h - --FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' --FIXES_INC='-I$(top_srcdir)/xfixes' -+cat >>confdefs.h <<_ACEOF -+#define VENDOR_MAN_VERSION "$VENDOR_MAN_VERSION" -+_ACEOF - - --$as_echo "#define DAMAGE 1" >>confdefs.h - --DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' --DAMAGE_INC='-I$(top_srcdir)/damageext' --MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' --MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' -+cat >>confdefs.h <<\_ACEOF -+#define NO_LIBCWRAPPER 1 -+_ACEOF - --# XINPUT extension is integral part of the server --XI_LIB='$(top_builddir)/Xi/libXi.la' --XI_INC='-I$(top_srcdir)/Xi' - -- if test "x$XF86UTILS" = xyes; then -- XF86UTILS_TRUE= -- XF86UTILS_FALSE='#' -+if test "x$DEBUGGING" = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define DEBUG 1 -+_ACEOF -+ -+fi -+ if test "x$DEBUGGING" = xyes; then -+ DEBUG_TRUE= -+ DEBUG_FALSE='#' - else -- XF86UTILS_TRUE='#' -- XF86UTILS_FALSE= -+ DEBUG_TRUE='#' -+ DEBUG_FALSE= - fi - -- if test "x$XAA" = xyes; then -- XAA_TRUE= -- XAA_FALSE='#' -+ -+# If unittests aren't explicitly disabled, check for required support -+if test "x$UNITTESTS" != xno ; then -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 -+$as_echo_n "checking for GLIB... " >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLIB_CFLAGS"; then -+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$LIBGLIB" 2>/dev/null` - else -- XAA_TRUE='#' -- XAA_FALSE= -+ pkg_failed=yes - fi -- -- if test "x$VGAHW" = xyes; then -- VGAHW_TRUE= -- VGAHW_FALSE='#' -+ fi - else -- VGAHW_TRUE='#' -- VGAHW_FALSE= -+ pkg_failed=untried - fi -- -- if test "x$VBE" = xyes; then -- VBE_TRUE= -- VBE_FALSE='#' -+if test -n "$PKG_CONFIG"; then -+ if test -n "$GLIB_LIBS"; then -+ pkg_cv_GLIB_LIBS="$GLIB_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$LIBGLIB" 2>/dev/null` - else -- VBE_TRUE='#' -- VBE_FALSE= -+ pkg_failed=yes - fi -- -- if test "x$INT10MODULE" = xyes; then -- INT10MODULE_TRUE= -- INT10MODULE_FALSE='#' -+ fi - else -- INT10MODULE_TRUE='#' -- INT10MODULE_FALSE= -+ pkg_failed=untried - fi - - - --$as_echo "#define SHAPE 1" >>confdefs.h -- -- -- -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$XKBPATH\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- XKB_BASE_DIRECTORY="$ac_define_dir" -- -- --cat >>confdefs.h <<_ACEOF --#define XKB_BASE_DIRECTORY "$ac_define_dir" --_ACEOF -- -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -- -+if test $pkg_failed = yes; then - --# Check whether --with-xkb-bin-directory was given. --if test "${with_xkb_bin_directory+set}" = set; then : -- withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval" -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- XKB_BIN_DIRECTORY="$bindir" -+ _pkg_short_errors_supported=no - fi -+ if test $_pkg_short_errors_supported = yes; then -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"` -+ else -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$GLIB_PKG_ERRORS" >&5 - -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_GLIB=no -+elif test $pkg_failed = untried; then -+ HAVE_GLIB=no -+else -+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS -+ GLIB_LIBS=$pkg_cv_GLIB_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_GLIB=yes -+fi - -- -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$XKB_BIN_DIRECTORY\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- XKB_BIN_DIRECTORY="$ac_define_dir" -- -- --cat >>confdefs.h <<_ACEOF --#define XKB_BIN_DIRECTORY "$ac_define_dir" -+ # Check if linker supports -wrap, passed via compiler flags -+ # When cross-compiling, reports no, since unit tests run from -+ # "make check", so would be running on build machine, not target -+ { $as_echo "$as_me:$LINENO: checking whether the linker supports -wrap" >&5 -+$as_echo_n "checking whether the linker supports -wrap... " >&6; } -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -Wl,-wrap,exit" -+ if test "$cross_compiling" = yes; then -+ linker_can_wrap="no" -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -- -+ void __wrap_exit (int s) -+ { -+ __real_exit (0); -+ } -+int -+main () -+{ -+exit (1); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ linker_can_wrap="yes" -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` --if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+( exit $ac_status ) -+linker_can_wrap="no" -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - --XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` --XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` -- -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$XKBOUTPUT\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- XKM_OUTPUT_DIR="$ac_define_dir" -+ { $as_echo "$as_me:$LINENO: result: $linker_can_wrap" >&5 -+$as_echo "$linker_can_wrap" >&6; } -+ LDFLAGS="$save_LDFLAGS" -+fi - -+if test "x$UNITTESTS" = xauto; then -+ if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then -+ UNITTESTS=yes -+ else -+ UNITTESTS=no -+ fi -+fi -+if test "x$UNITTESTS" = xyes; then -+ if test "x$HAVE_GLIB" = xno; then -+ { { $as_echo "$as_me:$LINENO: error: glib required to build unit tests" >&5 -+$as_echo "$as_me: error: glib required to build unit tests" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ if test "x$linker_can_wrap" = xno; then -+ { { $as_echo "$as_me:$LINENO: error: ld -wrap support required to build unit tests" >&5 -+$as_echo "$as_me: error: ld -wrap support required to build unit tests" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - --cat >>confdefs.h <<_ACEOF --#define XKM_OUTPUT_DIR "$ac_define_dir" -+cat >>confdefs.h <<\_ACEOF -+#define UNITTESTS 1 - _ACEOF - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -- - - --if test "x$XKB_DFLT_RULES" = x; then -- case $host_os in -- linux*) -- if test "x$CONFIG_HAL" = xyes; then -- XKB_DFLT_RULES="evdev" -- else -- XKB_DFLT_RULES="base" -- fi -- ;; -- *) -- XKB_DFLT_RULES="base" -- ;; -- esac -+fi -+ if test "x$UNITTESTS" = xyes; then -+ UNITTESTS_TRUE= -+ UNITTESTS_FALSE='#' -+else -+ UNITTESTS_TRUE='#' -+ UNITTESTS_FALSE= - fi - --cat >>confdefs.h <<_ACEOF --#define XKB_DFLT_RULES "$XKB_DFLT_RULES" --_ACEOF - - --cat >>confdefs.h <<_ACEOF --#define XKB_DFLT_MODEL "$XKB_DFLT_MODEL" -+cat >>confdefs.h <<\_ACEOF -+#define XTEST 1 - _ACEOF - - --cat >>confdefs.h <<_ACEOF --#define XKB_DFLT_LAYOUT "$XKB_DFLT_LAYOUT" -+cat >>confdefs.h <<\_ACEOF -+#define XSYNC 1 - _ACEOF - - --cat >>confdefs.h <<_ACEOF --#define XKB_DFLT_VARIANT "$XKB_DFLT_VARIANT" -+cat >>confdefs.h <<\_ACEOF -+#define XCMISC 1 - _ACEOF - - --cat >>confdefs.h <<_ACEOF --#define XKB_DFLT_OPTIONS "$XKB_DFLT_OPTIONS" -+cat >>confdefs.h <<\_ACEOF -+#define BIGREQS 1 - _ACEOF - - --XKB_LIB='$(top_builddir)/xkb/libxkb.la' --XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' --REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" -- --ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" --if test "x$ac_cv_func_strcasecmp" = x""yes; then : -- -+if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then -+ DIX_LIB='$(top_builddir)/dix/dix.O' -+ OS_LIB='$(top_builddir)/os/os.O' - else -- --$as_echo "#define NEED_STRCASECMP 1" >>confdefs.h -- -+ DIX_LIB='$(top_builddir)/dix/libdix.la' -+ OS_LIB='$(top_builddir)/os/libos.la' - fi - --ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" --if test "x$ac_cv_func_strncasecmp" = x""yes; then : - --else - --$as_echo "#define NEED_STRNCASECMP 1" >>confdefs.h -+MAIN_LIB='$(top_builddir)/dix/libmain.la' - --fi - --ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" --if test "x$ac_cv_func_strcasestr" = x""yes; then : -+MI_LIB='$(top_builddir)/mi/libmi.la' -+MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' -+MI_INC='-I$(top_srcdir)/mi' -+FB_LIB='$(top_builddir)/fb/libfb.la' -+FB_INC='-I$(top_srcdir)/fb' -+MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' -+MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' -+CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' - -+# OpenSSL used for SHA1 hashing in render/glyph.c, but we don't need all of -+# the OpenSSL libraries, just libcrypto -+# Some systems have matching functionality in the smaller/simpler libmd -+# Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS -+if test "x$SHA1_LIB" = "x" ; then -+ { $as_echo "$as_me:$LINENO: checking for SHA1Init in -lmd" >&5 -+$as_echo_n "checking for SHA1Init in -lmd... " >&6; } -+if test "${ac_cv_lib_md_SHA1Init+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lmd $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --$as_echo "#define NEED_STRCASESTR 1" >>confdefs.h -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char SHA1Init (); -+int -+main () -+{ -+return SHA1Init (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_md_SHA1Init=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_lib_md_SHA1Init=no - fi - -- --if test "x$NULL_ROOT_CURSOR" = xyes; then -- --$as_echo "#define NULL_ROOT_CURSOR 1" >>confdefs.h -- -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_md_SHA1Init" >&5 -+$as_echo "$ac_cv_lib_md_SHA1Init" >&6; } -+if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then -+ SHA1_LIB="-lmd" - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SHA1_IN_LIBMD 1 -+_ACEOF - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5 --$as_echo_n "checking for XDMCP... " >&6; } -- --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMCP_CFLAGS"; then -- pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMCP_LIBS"; then -- pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null` --else -- pkg_failed=yes - fi -- fi --else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no - fi -- if test $_pkg_short_errors_supported = yes; then -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` -- else -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XDMCP_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- have_libxdmcp="no" --elif test $pkg_failed = untried; then -- have_libxdmcp="no" -+if test "x$SHA1_LIB" = "x" ; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OPENSSL\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "OPENSSL") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ openssl - else -- XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS -- XDMCP_LIBS=$pkg_cv_XDMCP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- have_libxdmcp="yes" -+ HAVE_OPENSSL_PKC=yes - fi --if test "x$have_libxdmcp" = xyes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpWrap in -lXdmcp" >&5 --$as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; } --if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then : -+ if test "x$HAVE_OPENSSL_PKC" = xyes; then -+ REQUIRED_LIBS="$REQUIRED_LIBS openssl" -+ else -+ { $as_echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5 -+$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; } -+if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXdmcp $XDMCP_LIBS $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+LIBS="-lcrypto $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -18089,271 +25466,400 @@ - #ifdef __cplusplus - extern "C" - #endif --char XdmcpWrap (); -+char SHA1_Init (); - int - main () - { --return XdmcpWrap (); -+return SHA1_Init (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_Xdmcp_XdmcpWrap=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_crypto_SHA1_Init=yes - else -- ac_cv_lib_Xdmcp_XdmcpWrap=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_crypto_SHA1_Init=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5 --$as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; } --if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then : -- have_xdmcpwrap="yes" -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SHA1_Init" >&5 -+$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; } -+if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then -+ SHA1_LIB="-lcrypto" - else -- have_xdmcpwrap="no" --fi -- --fi --if test "x$XDMCP" = xauto; then -- if test "x$have_libxdmcp" = xyes; then -- XDMCP=yes -- else -- XDMCP=no -- fi --fi --if test "x$XDMAUTH" = xauto; then -- if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then -- XDMAUTH=yes -- else -- XDMAUTH=no -- fi -+ { { $as_echo "$as_me:$LINENO: error: OpenSSL must be installed in order to build the X server." >&5 -+$as_echo "$as_me: error: OpenSSL must be installed in order to build the X server." >&2;} -+ { (exit 1); exit 1; }; } - fi - -- if test "x$XDMCP" = xyes; then -- XDMCP_TRUE= -- XDMCP_FALSE='#' --else -- XDMCP_TRUE='#' -- XDMCP_FALSE= -+ fi - fi - --if test "x$XDMCP" = xyes; then - --$as_echo "#define XDMCP 1" >>confdefs.h -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5 -+$as_echo_n "checking for XSERVERCFLAGS... " >&6; } - -- REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" -- XDMCP_MODULES="xdmcp" -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XSERVERCFLAGS_CFLAGS"; then -+ pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XSERVERCFLAGS_LIBS"; then -+ pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` -+else -+ pkg_failed=yes - fi -- -- if test "x$XDMAUTH" = xyes; then -- XDMAUTH_TRUE= -- XDMAUTH_FALSE='#' -+ fi - else -- XDMAUTH_TRUE='#' -- XDMAUTH_FALSE= -+ pkg_failed=untried - fi - --if test "x$XDMAUTH" = xyes; then -- --$as_echo "#define HASXDMAUTH 1" >>confdefs.h -- -- if ! test "x$XDMCP" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" -- XDMCP_MODULES="xdmcp" -- fi --fi - - -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$FONTPATH\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- COMPILEDDEFAULTFONTPATH="$ac_define_dir" -+if test $pkg_failed = yes; then - -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ else -+ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 - --cat >>confdefs.h <<_ACEOF --#define COMPILEDDEFAULTFONTPATH "$ac_define_dir" --_ACEOF -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -+$XSERVERCFLAGS_PKG_ERRORS - -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$PCI_TXT_IDS_DIR\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- PCI_TXT_IDS_PATH="$ac_define_dir" -+Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -+and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: - -+$XSERVERCFLAGS_PKG_ERRORS - --cat >>confdefs.h <<_ACEOF --#define PCI_TXT_IDS_PATH "$ac_define_dir" --_ACEOF -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -+Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -+and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -+and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$SERVERCONFIG\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- SERVER_MISC_CONFIG_PATH="$ac_define_dir" -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -+and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --cat >>confdefs.h <<_ACEOF --#define SERVER_MISC_CONFIG_PATH "$ac_define_dir" --_ACEOF -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+else -+ XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS -+ XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : -+fi - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5 -+$as_echo_n "checking for XSERVERLIBS... " >&6; } - -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XSERVERLIBS_CFLAGS"; then -+ pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$XSERVERLIBS_LIBS"; then -+ pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi - -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$FONTDIR\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- BASE_FONT_PATH="$ac_define_dir" - - --cat >>confdefs.h <<_ACEOF --#define BASE_FONT_PATH "$ac_define_dir" --_ACEOF -+if test $pkg_failed = yes; then - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -+ else -+ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$XSERVERLIBS_PKG_ERRORS" >&5 - -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_LIBS) were not met: - -- prefix_NONE= -- exec_prefix_NONE= -- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix -- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -- eval ac_define_dir="\"$DRI_DRIVER_PATH\"" -- eval ac_define_dir="\"$ac_define_dir\"" -- DRI_DRIVER_PATH="$ac_define_dir" -+$XSERVERLIBS_PKG_ERRORS - -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - --cat >>confdefs.h <<_ACEOF --#define DRI_DRIVER_PATH "$ac_define_dir" --_ACEOF -+Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -+and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($REQUIRED_LIBS) were not met: - -- test "$prefix_NONE" && prefix=NONE -- test "$exec_prefix_NONE" && exec_prefix=NONE -+$XSERVERLIBS_PKG_ERRORS - -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - --cat >>confdefs.h <<_ACEOF --#define XVENDORNAME "$VENDOR_NAME" --_ACEOF -+Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -+and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -+and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --cat >>confdefs.h <<_ACEOF --#define XVENDORNAMESHORT "$VENDOR_NAME_SHORT" --_ACEOF -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - -+Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -+and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --cat >>confdefs.h <<_ACEOF --#define XORG_DATE "$RELEASE_DATE" --_ACEOF -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } -+else -+ XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS -+ XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ : -+fi - -+# Autotools has some unfortunate issues with library handling. In order to -+# get a server to rebuild when a dependency in the tree is changed, it must -+# be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be -+# listed there, or some versions of autotools will break (especially if a -L -+# is required to find the library). So, we keep two sets of libraries -+# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which -+# will go into the _DEPENDENCIES and _LDADD of the server, and -+# NAMESPACE_SYS_LIBS which will go into only the _LDADD. The -+# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in -+# NAMESPACE_SYS_LIBS. -+# -+# XSERVER_LIBS is the set of in-tree libraries which all servers require. -+# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers -+# require. -+# -+XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" -+XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" -+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" - --cat >>confdefs.h <<_ACEOF --#define XORG_MAN_VERSION "$VENDOR_MAN_VERSION" --_ACEOF - - --cat >>confdefs.h <<_ACEOF --#define BUILDERADDR "$BUILDERADDR" --_ACEOF -+UTILS_SYS_LIBS="${SYS_LIBS}" - - --if test -z "$OSNAME"; then -- OSNAME="UNKNOWN" -+# 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 - - --cat >>confdefs.h <<_ACEOF --#define OSNAME "$OSNAME" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define OSVENDOR "$OSVENDOR" --_ACEOF -- -- --cat >>confdefs.h <<_ACEOF --#define BUILDERSTRING "$BUILDERSTRING" -+{ $as_echo "$as_me:$LINENO: checking if SVR4 needs to be defined" >&5 -+$as_echo_n "checking if SVR4 needs to be defined... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) -+ I_AM_SVR4 -+#endif - -- -- --cat >>confdefs.h <<_ACEOF --#define VENDOR_NAME "$VENDOR_NAME" - _ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "I_AM_SVR4" >/dev/null 2>&1; then - - --cat >>confdefs.h <<_ACEOF --#define VENDOR_NAME_SHORT "$VENDOR_NAME_SHORT" -+cat >>confdefs.h <<\_ACEOF -+#define SVR4 1 - _ACEOF - -- --cat >>confdefs.h <<_ACEOF --#define VENDOR_RELEASE $VENDOR_RELEASE --_ACEOF -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+rm -f conftest* - - --cat >>confdefs.h <<_ACEOF --#define VENDOR_MAN_VERSION "$VENDOR_MAN_VERSION" --_ACEOF -+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC" - - - --$as_echo "#define NO_LIBCWRAPPER 1" >>confdefs.h -+{ $as_echo "$as_me:$LINENO: checking whether to build Xvfb DDX" >&5 -+$as_echo_n "checking whether to build Xvfb DDX... " >&6; } -+{ $as_echo "$as_me:$LINENO: result: $XVFB" >&5 -+$as_echo "$XVFB" >&6; } -+ if test "x$XVFB" = xyes; then -+ XVFB_TRUE= -+ XVFB_FALSE='#' -+else -+ XVFB_TRUE='#' -+ XVFB_FALSE= -+fi - - --if test "x$DEBUGGING" = xyes; then -+if test "x$XVFB" = xyes; then -+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" -+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" - --$as_echo "#define DEBUG 1" >>confdefs.h - - fi -- if test "x$DEBUGGING" = xyes; then -- DEBUG_TRUE= -- DEBUG_FALSE='#' --else -- DEBUG_TRUE='#' -- DEBUG_FALSE= --fi - - --# If unittests aren't explicitly disabled, check for required support --if test "x$UNITTESTS" != xno ; then -+ - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 --$as_echo_n "checking for GLIB... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for XNESTMODULES" >&5 -+$as_echo_n "checking for XNESTMODULES... " >&6; } - - if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_CFLAGS"; then -- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -+ if test -n "$XNESTMODULES_CFLAGS"; then -+ pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$LIBGLIB" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18362,16 +25868,16 @@ - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_LIBS"; then -- pkg_cv_GLIB_LIBS="$GLIB_LIBS" -+ if test -n "$XNESTMODULES_LIBS"; then -+ pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$LIBGLIB" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18390,254 +25896,228 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"` -+ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` - else -- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"` -+ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` - fi - # Put the nasty error message in config.log where it belongs -- echo "$GLIB_PKG_ERRORS" >&5 -+ echo "$XNESTMODULES_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -- HAVE_GLIB=no -+ have_xnest=no - elif test $pkg_failed = untried; then -- HAVE_GLIB=no -+ have_xnest=no - else -- GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS -- GLIB_LIBS=$pkg_cv_GLIB_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS -+ XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -- HAVE_GLIB=yes --fi -- -- # Check if linker supports -wrap, passed via compiler flags -- # When cross-compiling, reports no, since unit tests run from -- # "make check", so would be running on build machine, not target -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports -wrap" >&5 --$as_echo_n "checking whether the linker supports -wrap... " >&6; } -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -Wl,-wrap,exit" -- if test "$cross_compiling" = yes; then : -- linker_can_wrap="no" --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- void __wrap_exit (int s) -- { -- __real_exit (0); -- } --int --main () --{ --exit (1); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- linker_can_wrap="yes" --else -- linker_can_wrap="no" --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $linker_can_wrap" >&5 --$as_echo "$linker_can_wrap" >&6; } -- LDFLAGS="$save_LDFLAGS" --fi -- --if test "x$UNITTESTS" = xauto; then -- if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then -- UNITTESTS=yes -- else -- UNITTESTS=no -- fi -+ have_xnest=yes - fi --if test "x$UNITTESTS" = xyes; then -- if test "x$HAVE_GLIB" = xno; then -- as_fn_error "glib required to build unit tests" "$LINENO" 5 -- fi -- if test "x$linker_can_wrap" = xno; then -- as_fn_error "ld -wrap support required to build unit tests" "$LINENO" 5 -- fi -- --$as_echo "#define UNITTESTS 1" >>confdefs.h -- -- -- -+{ $as_echo "$as_me:$LINENO: checking whether to build Xnest DDX" >&5 -+$as_echo_n "checking whether to build Xnest DDX... " >&6; } -+if test "x$XNEST" = xauto; then -+ XNEST="$have_xnest" - fi -- if test "x$UNITTESTS" = xyes; then -- UNITTESTS_TRUE= -- UNITTESTS_FALSE='#' -+{ $as_echo "$as_me:$LINENO: result: $XNEST" >&5 -+$as_echo "$XNEST" >&6; } -+ if test "x$XNEST" = xyes; then -+ XNEST_TRUE= -+ XNEST_FALSE='#' - else -- UNITTESTS_TRUE='#' -- UNITTESTS_FALSE= -+ XNEST_TRUE='#' -+ XNEST_FALSE= - fi - - -- --$as_echo "#define XTEST 1" >>confdefs.h -- -- --$as_echo "#define XSYNC 1" >>confdefs.h -- -- --$as_echo "#define XCMISC 1" >>confdefs.h -- -- --$as_echo "#define BIGREQS 1" >>confdefs.h -+if test "x$XNEST" = xyes; then -+ if test "x$have_xnest" = xno; then -+ { { $as_echo "$as_me:$LINENO: error: Xnest build explicitly requested, but required modules not found." >&5 -+$as_echo "$as_me: error: Xnest build explicitly requested, but required modules not found." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB" -+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" - - --if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then -- DIX_LIB='$(top_builddir)/dix/dix.O' -- OS_LIB='$(top_builddir)/os/os.O' --else -- DIX_LIB='$(top_builddir)/dix/libdix.la' -- OS_LIB='$(top_builddir)/os/libos.la' - fi - - - --MAIN_LIB='$(top_builddir)/dix/libmain.la' -+{ $as_echo "$as_me:$LINENO: checking whether to build Xorg DDX" >&5 -+$as_echo_n "checking whether to build Xorg DDX... " >&6; } -+if test "x$XORG" = xauto; then -+ XORG="yes" -+ case $host_os in -+ cygwin*) XORG="no" ;; -+ darwin*) XORG="no" ;; -+ esac -+fi -+{ $as_echo "$as_me:$LINENO: result: $XORG" >&5 -+$as_echo "$XORG" >&6; } - -+xorg_bus_linuxpci=no -+xorg_bus_bsdpci=no -+xorg_bus_sparc=no - --MI_LIB='$(top_builddir)/mi/libmi.la' --MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' --MI_INC='-I$(top_srcdir)/mi' --FB_LIB='$(top_builddir)/fb/libfb.la' --FB_INC='-I$(top_srcdir)/fb' --MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' --MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' --CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' -+if test "x$XORG" = xyes; then -+ XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' -+ XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -+ XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" -+ XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" -+ XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB" - --# OpenSSL used for SHA1 hashing in render/glyph.c, but we don't need all of --# the OpenSSL libraries, just libcrypto --# Some systems have matching functionality in the smaller/simpler libmd --# Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS --if test "x$SHA1_LIB" = "x" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1Init in -lmd" >&5 --$as_echo_n "checking for SHA1Init in -lmd... " >&6; } --if test "${ac_cv_lib_md_SHA1Init+set}" = set; then : -+ symbol_visibility= -+ have_visibility=disabled -+ if test x$SYMBOL_VISIBILITY != xno; then -+ { $as_echo "$as_me:$LINENO: checking for symbol visibility support" >&5 -+$as_echo_n "checking for symbol visibility support... " >&6; } -+ if test x$GCC = xyes; then -+ VISIBILITY_CFLAGS="-fvisibility=hidden" -+ else -+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lmd $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char SHA1Init (); -+$ac_includes_default - int - main () - { --return SHA1Init (); -+#ifndef __SUNPRO_C -+ (void) __SUNPRO_C; -+#endif -+ - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_md_SHA1Init=yes -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl___SUNPRO_C=yes - else -- ac_cv_lib_md_SHA1Init=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_SHA1Init" >&5 --$as_echo "$ac_cv_lib_md_SHA1Init" >&6; } --if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then : -- SHA1_LIB="-lmd" -- --$as_echo "#define HAVE_SHA1_IN_LIBMD 1" >>confdefs.h -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_have_decl___SUNPRO_C=no - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- --if test "x$SHA1_LIB" = "x" ; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"OPENSSL\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "OPENSSL") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- openssl -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then -+ SUNCC="yes" - else -- HAVE_OPENSSL_PKC=yes -+ SUNCC="no" - fi -- if test "x$HAVE_OPENSSL_PKC" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS openssl" -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5 --$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; } --if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lcrypto $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char SHA1_Init (); -+ if test x$SUNCC = xyes; then -+ VISIBILITY_CFLAGS="-xldscope=hidden" -+ else -+ have_visibility=no -+ fi -+ fi -+ if test x$have_visibility != xno; then -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ extern _X_HIDDEN int hidden_int; -+ extern _X_EXPORT int public_int; -+ extern _X_HIDDEN int hidden_int_func(void); -+ extern _X_EXPORT int public_int_func(void); - int - main () - { --return SHA1_Init (); -+ - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_crypto_SHA1_Init=yes --else -- ac_cv_lib_crypto_SHA1_Init=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_Init" >&5 --$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; } --if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then : -- SHA1_LIB="-lcrypto" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ have_visibility=yes - else -- as_fn_error "OpenSSL must be installed in order to build the X server." "$LINENO" 5 --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- fi -+ have_visibility=no - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$save_CFLAGS -+ fi -+ { $as_echo "$as_me:$LINENO: result: $have_visibility" >&5 -+$as_echo "$have_visibility" >&6; } -+ if test x$have_visibility != xno; then -+ symbol_visibility=$VISIBILITY_CFLAGS -+ XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" -+ XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" -+ fi -+ fi -+ -+ - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERCFLAGS" >&5 --$as_echo_n "checking for XSERVERCFLAGS... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5 -+$as_echo_n "checking for PCIACCESS... " >&6; } - - if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERCFLAGS_CFLAGS"; then -- pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" -+ if test -n "$PCIACCESS_CFLAGS"; then -+ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18646,16 +26126,16 @@ - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERCFLAGS_LIBS"; then -- pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" -+ if test -n "$PCIACCESS_LIBS"; then -+ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18674,613 +26154,825 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"` - else -- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"` - fi - # Put the nasty error message in config.log where it belongs -- echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 -+ echo "$PCIACCESS_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBPCIACCESS) were not met: - --$XSERVERCFLAGS_PKG_ERRORS -+$PCIACCESS_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS --and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS --and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables PCIACCESS_CFLAGS -+and PCIACCESS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBPCIACCESS) were not met: - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } --else -- XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS -- XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : --fi -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERLIBS" >&5 --$as_echo_n "checking for XSERVERLIBS... " >&6; } -- --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERLIBS_CFLAGS"; then -- pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERLIBS_LIBS"; then -- pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -- else -- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XSERVERLIBS_PKG_ERRORS" >&5 -- -- as_fn_error "Package requirements ($REQUIRED_LIBS) were not met: -- --$XSERVERLIBS_PKG_ERRORS -+$PCIACCESS_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS --and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables PCIACCESS_CFLAGS -+and PCIACCESS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - --Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS --and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables PCIACCESS_CFLAGS -+and PCIACCESS_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables PCIACCESS_CFLAGS -+and PCIACCESS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS -- XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS -+ PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi -+ SAVE_LIBS=$LIBS -+ SAVE_CFLAGS=$CFLAGS -+ CFLAGS=$PCIACCESS_CFLAGS -+ LIBS=$PCIACCESS_LIBS - --# Autotools has some unfortunate issues with library handling. In order to --# get a server to rebuild when a dependency in the tree is changed, it must --# be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be --# listed there, or some versions of autotools will break (especially if a -L --# is required to find the library). So, we keep two sets of libraries --# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which --# will go into the _DEPENDENCIES and _LDADD of the server, and --# NAMESPACE_SYS_LIBS which will go into only the _LDADD. The --# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in --# NAMESPACE_SYS_LIBS. --# --# XSERVER_LIBS is the set of in-tree libraries which all servers require. --# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers --# require. --# --XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" --XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" --XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" -+for ac_func in pci_system_init_dev_mem -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --UTILS_SYS_LIBS="${SYS_LIBS}" -+#undef $ac_func - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - --# 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" -- ;; -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_var=no" -+fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5 --$as_echo_n "checking if SVR4 needs to be defined... " >&6; } --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) -- I_AM_SVR4 --#endif -- -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "I_AM_SVR4" >/dev/null 2>&1; then : - -+fi -+done - --$as_echo "#define SVR4 1" >>confdefs.h - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -+for ac_func in pci_device_enable -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi --rm -f conftest* -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC" -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef $ac_func - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xvfb DDX" >&5 --$as_echo_n "checking whether to build Xvfb DDX... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5 --$as_echo "$XVFB" >&6; } -- if test "x$XVFB" = xyes; then -- XVFB_TRUE= -- XVFB_FALSE='#' -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- XVFB_TRUE='#' -- XVFB_FALSE= -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - --if test "x$XVFB" = xyes; then -- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" -- XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" -+fi -+done - - --fi -+for ac_func in pci_device_is_boot_vga -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - -+#undef $ac_func - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNESTMODULES" >&5 --$as_echo_n "checking for XNESTMODULES... " >&6; } -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - --if test -n "$PKG_CONFIG"; then -- if test -n "$XNESTMODULES_CFLAGS"; then -- pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XNESTMODULES_LIBS"; then -- pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no -+ eval "$as_ac_var=no" - fi -- if test $_pkg_short_errors_supported = yes; then -- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` -- else -- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XNESTMODULES_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- have_xnest=no --elif test $pkg_failed = untried; then -- have_xnest=no --else -- XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS -- XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- have_xnest=yes --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5 --$as_echo_n "checking whether to build Xnest DDX... " >&6; } --if test "x$XNEST" = xauto; then -- XNEST="$have_xnest" --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XNEST" >&5 --$as_echo "$XNEST" >&6; } -- if test "x$XNEST" = xyes; then -- XNEST_TRUE= -- XNEST_FALSE='#' --else -- XNEST_TRUE='#' -- XNEST_FALSE= -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -- -- --if test "x$XNEST" = xyes; then -- if test "x$have_xnest" = xno; then -- as_fn_error "Xnest build explicitly requested, but required modules not found." "$LINENO" 5 -- fi -- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB" -- XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" -- -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - - fi -+done - - -+for ac_func in pci_device_vgaarb_init -+do -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg DDX" >&5 --$as_echo_n "checking whether to build Xorg DDX... " >&6; } --if test "x$XORG" = xauto; then -- XORG="yes" -- case $host_os in -- cygwin*) XORG="no" ;; -- darwin*) XORG="no" ;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG" >&5 --$as_echo "$XORG" >&6; } -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ - --xorg_bus_linuxpci=no --xorg_bus_bsdpci=no --xorg_bus_sparc=no -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif - --if test "x$XORG" = xyes; then -- XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' -- XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -- XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" -- XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" -- XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB" -+#undef $ac_func - -- symbol_visibility= -- have_visibility=disabled -- if test x$SYMBOL_VISIBILITY != xno; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol visibility support" >&5 --$as_echo_n "checking for symbol visibility support... " >&6; } -- if test x$GCC = xyes; then -- VISIBILITY_CFLAGS="-fvisibility=hidden" -- else -- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" --if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : -- SUNCC="yes" --else -- SUNCC="no" --fi -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - -- if test x$SUNCC = xyes; then -- VISIBILITY_CFLAGS="-xldscope=hidden" -- else -- have_visibility=no -- fi -- fi -- if test x$have_visibility != xno; then -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include -- extern _X_HIDDEN int hidden_int; -- extern _X_EXPORT int public_int; -- extern _X_HIDDEN int hidden_int_func(void); -- extern _X_EXPORT int public_int_func(void); - int - main () - { -- -+return $ac_func (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- have_visibility=yes -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ eval "$as_ac_var=yes" - else -- have_visibility=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$save_CFLAGS -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_visibility" >&5 --$as_echo "$have_visibility" >&6; } -- if test x$have_visibility != xno; then -- symbol_visibility=$VISIBILITY_CFLAGS -- XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" -- XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" -- fi -- fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - -+fi -+done - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5 --$as_echo_n "checking for PCIACCESS... " >&6; } -+ LIBS=$SAVE_LIBS -+ CFLAGS=$SAVE_CFLAGS -+ XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" -+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - --if test -n "$PKG_CONFIG"; then -- if test -n "$PCIACCESS_CFLAGS"; then -- pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null` --else -- pkg_failed=yes -+ case $host_os in -+ linux*) -+ if test "x$LNXAPM" = xyes; then -+ XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" -+ fi -+ XORG_OS="linux" -+ XORG_OS_SUBDIR="linux" -+ xorg_bus_linuxpci="yes" -+ linux_acpi="no" -+ case $host_cpu in -+ ia64*) -+ linux_ia64=yes -+ linux_acpi="yes" -+ ;; -+ alpha*) -+ linux_alpha=yes -+ ;; -+ i*86|amd64*|x86_64*) -+ linux_acpi="yes" -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | kfreebsd*-gnu | dragonfly*) -+ XORG_OS="freebsd" -+ XORG_OS_SUBDIR="bsd" -+ xorg_bus_bsdpci="yes" -+ ;; -+ netbsd*) -+ XORG_OS="netbsd" -+ XORG_OS_SUBDIR="bsd" -+ xorg_bus_bsdpci="yes" -+ ;; -+ openbsd*) -+ if test "x$ac_cv_BSD_APM" = xyes \ -+ -o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then -+ XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" -+ fi -+ XORG_OS="openbsd" -+ XORG_OS_SUBDIR="bsd" -+ xorg_bus_bsdpci="yes" -+ ;; -+ solaris*) -+ XORG_OS="solaris" -+ XORG_OS_SUBDIR="solaris" -+ # Use the same stubs as BSD for old functions, since we now -+ # use libpciaccess for PCI -+ xorg_bus_bsdpci="yes" -+ -+for ac_header in sys/kd.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - fi -- fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$PCIACCESS_LIBS"; then -- pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no -+ ac_header_compiler=no - fi -- if test $_pkg_short_errors_supported = yes; then -- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"` -- else -- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$PCIACCESS_PKG_ERRORS" >&5 -- -- as_fn_error "Package requirements ($LIBPCIACCESS) were not met: - --$PCIACCESS_PKG_ERRORS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --Alternatively, you may set the environment variables PCIACCESS_CFLAGS --and PCIACCESS_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" "$LINENO" 5 --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+ ac_header_preproc=no -+fi - --Alternatively, you may set the environment variables PCIACCESS_CFLAGS --and PCIACCESS_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - --To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - else -- PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS -- PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- : -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -- SAVE_LIBS=$LIBS -- SAVE_CFLAGS=$CFLAGS -- CFLAGS=$PCIACCESS_CFLAGS -- LIBS=$PCIACCESS_LIBS -- for ac_func in pci_system_init_dev_mem --do : -- ac_fn_c_check_func "$LINENO" "pci_system_init_dev_mem" "ac_cv_func_pci_system_init_dev_mem" --if test "x$ac_cv_func_pci_system_init_dev_mem" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_PCI_SYSTEM_INIT_DEV_MEM 1 --_ACEOF -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --done -- -- for ac_func in pci_device_enable --do : -- ac_fn_c_check_func "$LINENO" "pci_device_enable" "ac_cv_func_pci_device_enable" --if test "x$ac_cv_func_pci_device_enable" = x""yes; then : -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_PCI_DEVICE_ENABLE 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -+ - done - -- for ac_func in pci_device_is_boot_vga --do : -- ac_fn_c_check_func "$LINENO" "pci_device_is_boot_vga" "ac_cv_func_pci_device_is_boot_vga" --if test "x$ac_cv_func_pci_device_is_boot_vga" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_PCI_DEVICE_IS_BOOT_VGA 1 --_ACEOF - -+for ac_header in sys/vt.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 - fi --done -- -- for ac_func in pci_device_vgaarb_init --do : -- ac_fn_c_check_func "$LINENO" "pci_device_vgaarb_init" "ac_cv_func_pci_device_vgaarb_init" --if test "x$ac_cv_func_pci_device_vgaarb_init" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_PCI_DEVICE_VGAARB_INIT 1 -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> - _ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no - fi --done - -- LIBS=$SAVE_LIBS -- CFLAGS=$SAVE_CFLAGS -- XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" -- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- case $host_os in -- linux*) -- if test "x$LNXAPM" = xyes; then -- XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" -- fi -- XORG_OS="linux" -- XORG_OS_SUBDIR="linux" -- xorg_bus_linuxpci="yes" -- linux_acpi="no" -- case $host_cpu in -- ia64*) -- linux_ia64=yes -- linux_acpi="yes" -- ;; -- alpha*) -- linux_alpha=yes -- ;; -- i*86|amd64*|x86_64*) -- linux_acpi="yes" -- ;; -- *) -- ;; -- esac -- ;; -- freebsd* | kfreebsd*-gnu | dragonfly*) -- XORG_OS="freebsd" -- XORG_OS_SUBDIR="bsd" -- xorg_bus_bsdpci="yes" -- ;; -- netbsd*) -- XORG_OS="netbsd" -- XORG_OS_SUBDIR="bsd" -- xorg_bus_bsdpci="yes" -- ;; -- openbsd*) -- if test "x$ac_cv_BSD_APM" = xyes \ -- -o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then -- XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" -- fi -- XORG_OS="openbsd" -- XORG_OS_SUBDIR="bsd" -- xorg_bus_bsdpci="yes" -- ;; -- solaris*) -- XORG_OS="solaris" -- XORG_OS_SUBDIR="solaris" -- # Use the same stubs as BSD for old functions, since we now -- # use libpciaccess for PCI -- xorg_bus_bsdpci="yes" -- for ac_header in sys/kd.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/kd.h" "ac_cv_header_sys_kd_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_kd_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_KD_H 1 -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> - _ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no - fi - --done -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- for ac_header in sys/vt.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/vt.h" "ac_cv_header_sys_vt_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_vt_h" = x""yes; then : -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_VT_H 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - solaris_vt=yes - else -@@ -19290,21 +26982,75 @@ - done - - # Check for minimum supported release -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solaris version" >&5 -+ { $as_echo "$as_me:$LINENO: checking Solaris version" >&5 - $as_echo_n "checking Solaris version... " >&6; } - OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e s'/\..*$//'` - if test "${OS_MINOR}" -ge 7 ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris ${OS_MINOR}" >&5 -+ { $as_echo "$as_me:$LINENO: result: Solaris ${OS_MINOR}" >&5 - $as_echo "Solaris ${OS_MINOR}" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5 -+ { $as_echo "$as_me:$LINENO: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5 - $as_echo "Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&6; } - fi - if test "${OS_MINOR}" -lt 8 ; then -- as_fn_error "This release no longer supports Solaris versions older than Solaris 8." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: This release no longer supports Solaris versions older than Solaris 8." >&5 -+$as_echo "$as_me: error: This release no longer supports Solaris versions older than Solaris 8." >&2;} -+ { (exit 1); exit 1; }; } - fi -- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" --if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then : -+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then -+ $as_echo_n "(cached) " >&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 -+int -+main () -+{ -+#ifndef __SUNPRO_C -+ (void) __SUNPRO_C; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl___SUNPRO_C=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl___SUNPRO_C=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then - SUNCC="yes" - else - SUNCC="no" -@@ -19313,8 +27059,60 @@ - if test "x$SUNCC" = "xyes"; then - solaris_asm_inline="yes" - fi -- ac_fn_c_check_decl "$LINENO" "_LP64" "ac_cv_have_decl__LP64" "$ac_includes_default" --if test "x$ac_cv_have_decl__LP64" = x""yes; then : -+ { $as_echo "$as_me:$LINENO: checking whether _LP64 is declared" >&5 -+$as_echo_n "checking whether _LP64 is declared... " >&6; } -+if test "${ac_cv_have_decl__LP64+set}" = set; then -+ $as_echo_n "(cached) " >&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 -+int -+main () -+{ -+#ifndef _LP64 -+ (void) _LP64; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_have_decl__LP64=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_have_decl__LP64=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__LP64" >&5 -+$as_echo "$ac_cv_have_decl__LP64" >&6; } -+if test "x$ac_cv_have_decl__LP64" = x""yes; then - SOLARIS_64="yes" - else - SOLARIS_64="no" -@@ -19334,10 +27132,15 @@ - XORG_CFLAGS="$XORG_CFLAGS -DXF86PM" - ;; - *) -- as_fn_error "Unsupported Solaris platform. Only SPARC & x86 \ -+ { { $as_echo "$as_me:$LINENO: error: Unsupported Solaris platform. Only SPARC & x86 \ -+ are supported on Solaris in this release. If you are \ -+ interested in porting Xorg to your platform, please email \ -+ xorg@lists.freedesktop.org." >&5 -+$as_echo "$as_me: error: Unsupported Solaris platform. Only SPARC & x86 \ - are supported on Solaris in this release. If you are \ - interested in porting Xorg to your platform, please email \ -- xorg@lists.freedesktop.org." "$LINENO" 5 ;; -+ xorg@lists.freedesktop.org." >&2;} -+ { (exit 1); exit 1; }; } ;; - esac - - if test x$solaris_asm_inline = xyes ; then -@@ -19356,9 +27159,13 @@ - *) - XORG_OS="unknown" - XORG_OS_SUBDIR="unknown" -- as_fn_error "Your OS is unknown. Xorg currently only supports Linux, \ -+ { { $as_echo "$as_me:$LINENO: error: Your OS is unknown. Xorg currently only supports Linux, \ - Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \ -- Xorg to your platform, please email xorg@lists.freedesktop.org." "$LINENO" 5 -+ Xorg to your platform, please email xorg@lists.freedesktop.org." >&5 -+$as_echo "$as_me: error: Your OS is unknown. Xorg currently only supports Linux, \ -+ Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \ -+ Xorg to your platform, please email xorg@lists.freedesktop.org." >&2;} -+ { (exit 1); exit 1; }; } - ;; - esac - -@@ -19374,7 +27181,7 @@ - if test "x$DGA" = xauto; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DGA" >&5 - $as_echo_n "checking for DGA... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -19382,11 +27189,11 @@ - pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19400,11 +27207,11 @@ - pkg_cv_DGA_LIBS="$DGA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19431,7 +27238,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$DGA_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - DGA=no - elif test $pkg_failed = untried; then -@@ -19439,7 +27246,7 @@ - else - DGA_CFLAGS=$pkg_cv_DGA_CFLAGS - DGA_LIBS=$pkg_cv_DGA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - DGA=yes - fi -@@ -19448,7 +27255,7 @@ - XORG_MODULES="$XORG_MODULES $DGAPROTO" - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DGA" >&5 - $as_echo_n "checking for DGA... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -19456,11 +27263,11 @@ - pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19474,11 +27281,11 @@ - pkg_cv_DGA_LIBS="$DGA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19505,7 +27312,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$DGA_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($DGAPROTO) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($DGAPROTO) were not met: -+ -+$DGA_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DGA_CFLAGS -+and DGA_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($DGAPROTO) were not met: - - $DGA_PKG_ERRORS - -@@ -19515,11 +27333,22 @@ - Alternatively, you may set the environment variables DGA_CFLAGS - and DGA_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables DGA_CFLAGS -+and DGA_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -19528,26 +27357,31 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - DGA_CFLAGS=$pkg_cv_DGA_CFLAGS - DGA_LIBS=$pkg_cv_DGA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - --$as_echo "#define DGA 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define DGA 1 -+_ACEOF - - --$as_echo "#define XFreeXDGA 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XFreeXDGA 1 -+_ACEOF - - fi - - if test "x$XF86VIDMODE" = xauto; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 - $as_echo_n "checking for XF86VIDMODE... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -19555,11 +27389,11 @@ - pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19573,11 +27407,11 @@ - pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19604,7 +27438,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$XF86VIDMODE_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - XF86VIDMODE=no - elif test $pkg_failed = untried; then -@@ -19612,7 +27446,7 @@ - else - XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS - XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - XF86VIDMODE=yes - fi -@@ -19621,7 +27455,7 @@ - XORG_MODULES="$XORG_MODULES $VIDMODEPROTO" - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 - $as_echo_n "checking for XF86VIDMODE... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -19629,11 +27463,11 @@ - pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19647,11 +27481,11 @@ - pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null` - else - pkg_failed=yes -@@ -19678,7 +27512,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$XF86VIDMODE_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($VIDMODEPROTO) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($VIDMODEPROTO) were not met: - - $XF86VIDMODE_PKG_ERRORS - -@@ -19688,11 +27522,33 @@ - Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS - and XF86VIDMODE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&5 -+$as_echo "$as_me: error: Package requirements ($VIDMODEPROTO) were not met: -+ -+$XF86VIDMODE_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS -+and XF86VIDMODE_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS -+and XF86VIDMODE_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -19701,23 +27557,26 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS - XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - --$as_echo "#define XF86VIDMODE 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XF86VIDMODE 1 -+_ACEOF - - fi - - if test -n "$XORG_MODULES"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG_MODULES" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XORG_MODULES" >&5 - $as_echo_n "checking for XORG_MODULES... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -19725,11 +27584,11 @@ - pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XORG_MODULES_CFLAGS=`$PKG_CONFIG --cflags "$XORG_MODULES" 2>/dev/null` - else - pkg_failed=yes -@@ -19743,11 +27602,11 @@ - pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XORG_MODULES_LIBS=`$PKG_CONFIG --libs "$XORG_MODULES" 2>/dev/null` - else - pkg_failed=yes -@@ -19774,7 +27633,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XORG_MODULES_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($XORG_MODULES) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($XORG_MODULES) were not met: -+ -+$XORG_MODULES_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XORG_MODULES_CFLAGS -+and XORG_MODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($XORG_MODULES) were not met: - - $XORG_MODULES_PKG_ERRORS - -@@ -19784,11 +27654,22 @@ - Alternatively, you may set the environment variables XORG_MODULES_CFLAGS - and XORG_MODULES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XORG_MODULES_CFLAGS -+and XORG_MODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -19797,11 +27678,12 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS - XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi -@@ -19817,9 +27699,9 @@ - - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PERL+set}" = set; then : -+if test "${ac_cv_path_PERL+set}" = set; then - $as_echo_n "(cached) " >&6 - else - case $PERL in -@@ -19832,14 +27714,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" -@@ -19848,16 +27730,18 @@ - fi - PERL=$ac_cv_path_PERL - if test -n "$PERL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -+ { $as_echo "$as_me:$LINENO: result: $PERL" >&5 - $as_echo "$PERL" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - - - if test "x$PERL" = xno; then -- as_fn_error "Perl is required to build the XFree86/Xorg DDX." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: Perl is required to build the XFree86/Xorg DDX." >&5 -+$as_echo "$as_me: error: Perl is required to build the XFree86/Xorg DDX." >&2;} -+ { (exit 1); exit 1; }; } - fi - - -@@ -19867,16 +27751,24 @@ - CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" - LOGPREFIX="$logdir/Xorg." - --$as_echo "#define XORG_SERVER 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XORG_SERVER 1 -+_ACEOF - - --$as_echo "#define XORGSERVER 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XORGSERVER 1 -+_ACEOF - - --$as_echo "#define XFree86Server 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XFree86Server 1 -+_ACEOF - - --$as_echo "#define XFree86LOADER 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XFree86LOADER 1 -+_ACEOF - - - cat >>confdefs.h <<_ACEOF -@@ -19884,13 +27776,19 @@ - _ACEOF - - --$as_echo "#define NEED_XF86_TYPES 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define NEED_XF86_TYPES 1 -+_ACEOF - - --$as_echo "#define NEED_XF86_PROTOTYPES 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define NEED_XF86_PROTOTYPES 1 -+_ACEOF - - --$as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define __XSERVERNAME__ "Xorg" -+_ACEOF - - - prefix_NONE= -@@ -19983,11 +27881,15 @@ - _ACEOF - - --$as_echo "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XSERVER_LIBPCIACCESS 1 -+_ACEOF - - if test "x$VGAHW" = xyes; then - --$as_echo "#define WITH_VGAHW 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define WITH_VGAHW 1 -+_ACEOF - - fi - -@@ -20103,7 +28005,7 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XWin DDX" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether to build XWin DDX" >&5 - $as_echo_n "checking whether to build XWin DDX... " >&6; } - if test "x$XWIN" = xauto; then - case $host_os in -@@ -20112,16 +28014,16 @@ - *) XWIN="no" ;; - esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XWIN" >&5 -+{ $as_echo "$as_me:$LINENO: result: $XWIN" >&5 - $as_echo "$XWIN" >&6; } - - if test "x$XWIN" = xyes; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$WINDOWSWMPROTO") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - WINDOWSWM=yes - else - WINDOWSWM=no -@@ -20134,9 +28036,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. - set dummy ${ac_tool_prefix}windres; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_WINDRES+set}" = set; then : -+if test "${ac_cv_prog_WINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$WINDRES"; then -@@ -20147,24 +28049,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - WINDRES=$ac_cv_prog_WINDRES - if test -n "$WINDRES"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -+ { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 - $as_echo "$WINDRES" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -20174,9 +28076,9 @@ - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. - set dummy windres; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : -+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_WINDRES"; then -@@ -20187,24 +28089,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - fi - fi - ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES - if test -n "$ac_ct_WINDRES"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 - $as_echo "$ac_ct_WINDRES" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -20213,7 +28115,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -20228,7 +28130,7 @@ - XWIN_SERVER_NAME=XWin - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 - $as_echo_n "checking for XWINMODULES... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -20236,11 +28138,11 @@ - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null` - else - pkg_failed=yes -@@ -20254,11 +28156,11 @@ - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null` - else - pkg_failed=yes -@@ -20285,7 +28187,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: -+ -+$XWINMODULES_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XWINMODULES_CFLAGS -+and XWINMODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met: - - $XWINMODULES_PKG_ERRORS - -@@ -20295,11 +28208,22 @@ - Alternatively, you may set the environment variables XWINMODULES_CFLAGS - and XWINMODULES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XWINMODULES_CFLAGS -+and XWINMODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -20308,21 +28232,26 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS - XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - --$as_echo "#define HAS_DEVWINDOWS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define HAS_DEVWINDOWS 1 -+_ACEOF - - - if test "x$WINDOWSWM" = xyes ; then - --$as_echo "#define ROOTLESS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define ROOTLESS 1 -+_ACEOF - - CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND" - fi -@@ -20333,7 +28262,7 @@ - XWIN_SERVER_NAME=Xming - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 - $as_echo_n "checking for XWINMODULES... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -20341,11 +28270,11 @@ - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null` - else - pkg_failed=yes -@@ -20359,11 +28288,11 @@ - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null` - else - pkg_failed=yes -@@ -20390,7 +28319,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: -+ -+$XWINMODULES_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XWINMODULES_CFLAGS -+and XWINMODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met: - - $XWINMODULES_PKG_ERRORS - -@@ -20400,11 +28340,22 @@ - Alternatively, you may set the environment variables XWINMODULES_CFLAGS - and XWINMODULES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XWINMODULES_CFLAGS -+and XWINMODULES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -20413,19 +28364,24 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS - XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - --$as_echo "#define RELOCATE_PROJECTROOT 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define RELOCATE_PROJECTROOT 1 -+_ACEOF - - --$as_echo "#define HAS_WINSOCK 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define HAS_WINSOCK 1 -+_ACEOF - - XWIN_SYS_LIBS=-lwinsock2 - ;; -@@ -20438,29 +28394,39 @@ - - if test "x$DEBUGGING" = xyes; then - --$as_echo "#define CYGDEBUG 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define CYGDEBUG 1 -+_ACEOF - - --$as_echo "#define CYGWINDOWING_DEBUG 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define CYGWINDOWING_DEBUG 1 -+_ACEOF - - --$as_echo "#define CYGMULTIWINDOW_DEBUG 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define CYGMULTIWINDOW_DEBUG 1 -+_ACEOF - - fi - - --$as_echo "#define DDXOSVERRORF 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define DDXOSVERRORF 1 -+_ACEOF - - --$as_echo "#define DDXBEFORERESET 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define DDXBEFORERESET 1 -+_ACEOF - - if test "x$XF86VIDMODE" = xyes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling XF86VidMode extension" >&5 -+ { $as_echo "$as_me:$LINENO: Disabling XF86VidMode extension" >&5 - $as_echo "$as_me: Disabling XF86VidMode extension" >&6;} - XF86VIDMODE=no - fi - if test "x$COMPOSITE" = xyes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling Composite extension" >&5 -+ { $as_echo "$as_me:$LINENO: Disabling Composite extension" >&5 - $as_echo "$as_me: Disabling Composite extension" >&6;} - COMPOSITE=no - fi -@@ -20540,23 +28506,31 @@ - - if test "x$XQUARTZ" = xyes; then - --$as_echo "#define XQUARTZ 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XQUARTZ 1 -+_ACEOF - - --$as_echo "#define ROOTLESS 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define ROOTLESS 1 -+_ACEOF - - - DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB" - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5 -+ { $as_echo "$as_me:$LINENO: checking for xp_init in -lXplugin" >&5 - $as_echo_n "checking for xp_init in -lXplugin... " >&6; } --if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then : -+if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXplugin $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -20574,18 +28548,43 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_Xplugin_xp_init=yes - else -- ac_cv_lib_Xplugin_xp_init=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_Xplugin_xp_init=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xplugin_xp_init" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xplugin_xp_init" >&5 - $as_echo "$ac_cv_lib_Xplugin_xp_init" >&6; } --if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then : -+if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then - : - fi - -@@ -20594,7 +28593,7 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPBPROXY" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XPBPROXY" >&5 - $as_echo_n "checking for XPBPROXY... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -20602,11 +28601,11 @@ - pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XPBPROXY_CFLAGS=`$PKG_CONFIG --cflags "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` - else - pkg_failed=yes -@@ -20620,11 +28619,11 @@ - pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XPBPROXY_LIBS=`$PKG_CONFIG --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` - else - pkg_failed=yes -@@ -20651,7 +28650,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XPBPROXY_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: -+ -+$XPBPROXY_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XPBPROXY_CFLAGS -+and XPBPROXY_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met: - - $XPBPROXY_PKG_ERRORS - -@@ -20661,11 +28671,22 @@ - Alternatively, you may set the environment variables XPBPROXY_CFLAGS - and XPBPROXY_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XPBPROXY_CFLAGS -+and XPBPROXY_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -20674,24 +28695,29 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS - XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - if test "x$XQUARTZ_SPARKLE" = xyes ; then - --$as_echo "#define XQUARTZ_SPARKLE 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define XQUARTZ_SPARKLE 1 -+_ACEOF - - fi - - if test "x$STANDALONE_XPBPROXY" = xyes ; then - --$as_echo "#define STANDALONE_XPBPROXY 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define STANDALONE_XPBPROXY 1 -+_ACEOF - - fi - fi -@@ -20709,9 +28735,9 @@ - - depcc="$OBJC" am_compiler_list='gcc3 gcc' - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then : -+if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -20817,7 +28843,7 @@ - fi - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:$LINENO: result: $am_cv_OBJC_dependencies_compiler_type" >&5 - $as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } - OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type - -@@ -20860,7 +28886,7 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXMODULES" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DMXMODULES" >&5 - $as_echo_n "checking for DMXMODULES... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -20868,11 +28894,11 @@ - pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXMODULES_CFLAGS=`$PKG_CONFIG --cflags "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null` - else - pkg_failed=yes -@@ -20886,11 +28912,11 @@ - pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXMODULES_LIBS=`$PKG_CONFIG --libs "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null` - else - pkg_failed=yes -@@ -20917,7 +28943,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$DMXMODULES_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - have_dmx=no - elif test $pkg_failed = untried; then -@@ -20925,11 +28951,11 @@ - else - DMXMODULES_CFLAGS=$pkg_cv_DMXMODULES_CFLAGS - DMXMODULES_LIBS=$pkg_cv_DMXMODULES_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - have_dmx=yes - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xdmx DDX" >&5 -+{ $as_echo "$as_me:$LINENO: checking whether to build Xdmx DDX" >&5 - $as_echo_n "checking whether to build Xdmx DDX... " >&6; } - if test "x$DMX" = xauto; then - DMX="$have_dmx" -@@ -20938,7 +28964,7 @@ - darwin*) DMX="no" ;; - esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMX" >&5 -+{ $as_echo "$as_me:$LINENO: result: $DMX" >&5 - $as_echo "$DMX" >&6; } - if test "x$DMX" = xyes; then - DMX_TRUE= -@@ -20953,8 +28979,11 @@ - - if test "x$DMX" = xyes; then - if test "x$have_dmx" = xno; then -- as_fn_error "Xdmx build explicitly requested, but required -- modules not found." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: Xdmx build explicitly requested, but required -+ modules not found." >&5 -+$as_echo "$as_me: error: Xdmx build explicitly requested, but required -+ modules not found." >&2;} -+ { (exit 1); exit 1; }; } - fi - DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" - XDMX_CFLAGS="$DMXMODULES_CFLAGS" -@@ -20964,16 +28993,278 @@ - - - -- ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_input_h" = x""yes; then : -+ if test "${ac_cv_header_linux_input_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5 -+$as_echo_n "checking for linux/input.h... " >&6; } -+if test "${ac_cv_header_linux_input_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -+$as_echo "$ac_cv_header_linux_input_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking linux/input.h usability" >&5 -+$as_echo_n "checking linux/input.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking linux/input.h presence" >&5 -+$as_echo_n "checking linux/input.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: linux/input.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5 -+$as_echo_n "checking for linux/input.h... " >&6; } -+if test "${ac_cv_header_linux_input_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_header_linux_input_h=$ac_header_preproc -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -+$as_echo "$ac_cv_header_linux_input_h" >&6; } -+ -+fi -+if test "x$ac_cv_header_linux_input_h" = x""yes; then - DMX_BUILD_USB="yes" - else - DMX_BUILD_USB="no" - fi - - -- ac_fn_c_check_header_mongrel "$LINENO" "linux/keyboard.h" "ac_cv_header_linux_keyboard_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then : -+ if test "${ac_cv_header_linux_keyboard_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5 -+$as_echo_n "checking for linux/keyboard.h... " >&6; } -+if test "${ac_cv_header_linux_keyboard_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5 -+$as_echo "$ac_cv_header_linux_keyboard_h" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h usability" >&5 -+$as_echo_n "checking linux/keyboard.h usability... " >&6; } -+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 -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h presence" >&5 -+$as_echo_n "checking linux/keyboard.h presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5 -+$as_echo_n "checking for linux/keyboard.h... " >&6; } -+if test "${ac_cv_header_linux_keyboard_h+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_header_linux_keyboard_h=$ac_header_preproc -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5 -+$as_echo "$ac_cv_header_linux_keyboard_h" >&6; } -+ -+fi -+if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then - DMX_BUILD_LNX="yes" - else - DMX_BUILD_LNX="no" -@@ -20982,7 +29273,7 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMXCONFIG_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5 - $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -20990,11 +29281,11 @@ - pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XDMXCONFIG_DEP_CFLAGS=`$PKG_CONFIG --cflags "xaw7 xmu xt xpm x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21008,11 +29299,11 @@ - pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XDMXCONFIG_DEP_LIBS=`$PKG_CONFIG --libs "xaw7 xmu xt xpm x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21039,7 +29330,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (xaw7 xmu xt xpm x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (xaw7 xmu xt xpm x11) were not met: -+ -+$XDMXCONFIG_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -+and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (xaw7 xmu xt xpm x11) were not met: - - $XDMXCONFIG_DEP_PKG_ERRORS - -@@ -21049,11 +29351,12 @@ - Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS - and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21062,11 +29365,22 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -+and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XDMXCONFIG_DEP_CFLAGS=$pkg_cv_XDMXCONFIG_DEP_CFLAGS - XDMXCONFIG_DEP_LIBS=$pkg_cv_XDMXCONFIG_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi -@@ -21074,7 +29388,7 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXEXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21082,11 +29396,11 @@ - pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21100,11 +29414,11 @@ - pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21131,7 +29445,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($LIBDMX $LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met: -+ -+$DMXEXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -+and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met: - - $DMXEXAMPLES_DEP_PKG_ERRORS - -@@ -21141,11 +29466,22 @@ - Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS - and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -+and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21154,18 +29490,19 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - DMXEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXEXAMPLES_DEP_CFLAGS - DMXEXAMPLES_DEP_LIBS=$pkg_cv_DMXEXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXMUEXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21173,11 +29510,11 @@ - pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21191,11 +29528,11 @@ - pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXXMUEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21222,7 +29559,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: -+ -+$DMXXMUEXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -+and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: - - $DMXXMUEXAMPLES_DEP_PKG_ERRORS - -@@ -21232,11 +29580,22 @@ - Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS - and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -+and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21245,18 +29604,19 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - DMXXMUEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS - DMXXMUEXAMPLES_DEP_LIBS=$pkg_cv_DMXXMUEXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXIEXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21264,11 +29624,11 @@ - pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21282,11 +29642,11 @@ - pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_DMXXIEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21313,7 +29673,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: -+ -+$DMXXIEXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -+and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: - - $DMXXIEXAMPLES_DEP_PKG_ERRORS - -@@ -21323,11 +29694,22 @@ - Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS - and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -+and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21336,18 +29718,19 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - DMXXIEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS - DMXXIEXAMPLES_DEP_LIBS=$pkg_cv_DMXXIEXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTSTEXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5 - $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21355,11 +29738,11 @@ - pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XTSTEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXTST $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21373,11 +29756,11 @@ - pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XTSTEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXTST $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21404,7 +29787,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($LIBXTST $LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met: -+ -+$XTSTEXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -+and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met: - - $XTSTEXAMPLES_DEP_PKG_ERRORS - -@@ -21414,11 +29808,22 @@ - Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS - and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -+and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21427,18 +29832,19 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XTSTEXAMPLES_DEP_CFLAGS=$pkg_cv_XTSTEXAMPLES_DEP_CFLAGS - XTSTEXAMPLES_DEP_LIBS=$pkg_cv_XTSTEXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRESEXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5 - $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21446,11 +29852,11 @@ - pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XRESEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "xres $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21464,11 +29870,11 @@ - pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XRESEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "xres $LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21495,7 +29901,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (xres $LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (xres $LIBXEXT x11) were not met: -+ -+$XRESEXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -+and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (xres $LIBXEXT x11) were not met: - - $XRESEXAMPLES_DEP_PKG_ERRORS - -@@ -21505,11 +29922,22 @@ - Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS - and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -+and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21518,18 +29946,19 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - XRESEXAMPLES_DEP_CFLAGS=$pkg_cv_XRESEXAMPLES_DEP_CFLAGS - XRESEXAMPLES_DEP_LIBS=$pkg_cv_XRESEXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXAMPLES_DEP" >&5 -+{ $as_echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5 - $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21537,11 +29966,11 @@ - pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_X11EXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21555,11 +29984,11 @@ - pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_X11EXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXEXT x11" 2>/dev/null` - else - pkg_failed=yes -@@ -21586,7 +30015,18 @@ - # Put the nasty error message in config.log where it belongs - echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements ($LIBXEXT x11) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXEXT x11) were not met: -+ -+$X11EXAMPLES_DEP_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -+and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements ($LIBXEXT x11) were not met: - - $X11EXAMPLES_DEP_PKG_ERRORS - -@@ -21596,11 +30036,22 @@ - Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS - and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. --" "$LINENO" 5 -+" >&2;} -+ { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -+and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -21609,11 +30060,12 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else - X11EXAMPLES_DEP_CFLAGS=$pkg_cv_X11EXAMPLES_DEP_CFLAGS - X11EXAMPLES_DEP_LIBS=$pkg_cv_X11EXAMPLES_DEP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi -@@ -21622,9 +30074,9 @@ - fi - # Extract the first word of "doxygen", so it can be a program name with args. - set dummy doxygen; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_DOXYGEN+set}" = set; then : -+if test "${ac_cv_path_DOXYGEN+set}" = set; then - $as_echo_n "(cached) " >&6 - else - case $DOXYGEN in -@@ -21637,14 +30089,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -- done -+done - IFS=$as_save_IFS - - test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="not_found" -@@ -21653,16 +30105,16 @@ - fi - DOXYGEN=$ac_cv_path_DOXYGEN - if test -n "$DOXYGEN"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -+ { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5 - $as_echo "$DOXYGEN" >&6; } - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - - - if test "x$DOXYGEN" = "xnot_found" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&5 - $as_echo "$as_me: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&2;} - fi - -@@ -21705,18 +30157,160 @@ - - if test "$KDRIVE" = yes; then - --$as_echo "#define KDRIVESERVER 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define KDRIVESERVER 1 -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define KDRIVEDDXACTIONS /**/ -+_ACEOF -+ -+ -+ -+ -+for ac_header in sys/vm86.h sys/io.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - --$as_echo "#define KDRIVEDDXACTIONS /**/" >>confdefs.h -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - -- for ac_header in sys/vm86.h sys/io.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -21732,16 +30326,157 @@ - if test "x$KDRIVEVESA" = xyes; then - KDRIVEFBDEVLIB=yes - --$as_echo "#define KDRIVEVESA 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define KDRIVEVESA 1 -+_ACEOF - - fi - -- for ac_header in linux/fb.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_fb_h" = x""yes; then : -+ -+for ac_header in linux/fb.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+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 <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ---------------------------------------------------------------------- ## -+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -+## ---------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_LINUX_FB_H 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -21755,14 +30490,16 @@ - if test "x$XFBDEV" = xyes; then - KDRIVEFBDEVLIB=yes - --$as_echo "#define KDRIVEFBDEV 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define KDRIVEFBDEV 1 -+_ACEOF - - fi - - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 -+{ $as_echo "$as_me:$LINENO: checking for TSLIB" >&5 - $as_echo_n "checking for TSLIB... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21770,11 +30507,11 @@ - pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null` - else - pkg_failed=yes -@@ -21788,11 +30525,11 @@ - pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null` - else - pkg_failed=yes -@@ -21819,7 +30556,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$TSLIB_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - HAVE_TSLIB="no" - elif test $pkg_failed = untried; then -@@ -21827,19 +30564,23 @@ - else - TSLIB_CFLAGS=$pkg_cv_TSLIB_CFLAGS - TSLIB_LIBS=$pkg_cv_TSLIB_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - HAVE_TSLIB="yes" - fi - if test "x$HAVE_TSLIB" = xno; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ts_open in -lts" >&5 -+ { $as_echo "$as_me:$LINENO: checking for ts_open in -lts" >&5 - $as_echo_n "checking for ts_open in -lts... " >&6; } --if test "${ac_cv_lib_ts_ts_open+set}" = set; then : -+if test "${ac_cv_lib_ts_ts_open+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lts $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -21857,18 +30598,43 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_ts_ts_open=yes - else -- ac_cv_lib_ts_ts_open=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_ts_ts_open=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ts_ts_open" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ts_ts_open" >&5 - $as_echo "$ac_cv_lib_ts_ts_open" >&6; } --if test "x$ac_cv_lib_ts_ts_open" = x""yes; then : -+if test "x$ac_cv_lib_ts_ts_open" = x""yes; then - HAVE_TSLIB="yes" - fi - -@@ -21880,10 +30646,14 @@ - - if test "x$TSLIB" = xyes; then - if ! test "x$HAVE_TSLIB" = xyes; then -- as_fn_error "tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&5 -+$as_echo "$as_me: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&2;} -+ { (exit 1); exit 1; }; } - else - --$as_echo "#define TSLIB 1" >>confdefs.h -+cat >>confdefs.h <<\_ACEOF -+#define TSLIB 1 -+_ACEOF - - fi - fi -@@ -21898,7 +30668,7 @@ - - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEPHYR" >&5 -+{ $as_echo "$as_me:$LINENO: checking for XEPHYR" >&5 - $as_echo_n "checking for XEPHYR... " >&6; } - - if test -n "$PKG_CONFIG"; then -@@ -21906,11 +30676,11 @@ - pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` - else - pkg_failed=yes -@@ -21924,11 +30694,11 @@ - pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then - pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` - else - pkg_failed=yes -@@ -21955,7 +30725,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$XEPHYR_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - xephyr="no" - elif test $pkg_failed = untried; then -@@ -21963,7 +30733,7 @@ - else - XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS - XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } - xephyr="yes" - fi -@@ -21971,19 +30741,107 @@ - XEPHYR=$xephyr - fi - -- # Xephyr needs nanosleep() which is in librt on Solaris -- ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" --if test "x$ac_cv_func_nanosleep" = x""yes; then : -+ # Xephyr needs nanosleep() which is in librt on Solaris -+ { $as_echo "$as_me:$LINENO: checking for nanosleep" >&5 -+$as_echo_n "checking for nanosleep... " >&6; } -+if test "${ac_cv_func_nanosleep+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define nanosleep to an innocuous variant, in case declares nanosleep. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define nanosleep innocuous_nanosleep -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char nanosleep (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef nanosleep -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char nanosleep (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_nanosleep || defined __stub___nanosleep -+choke me -+#endif -+ -+int -+main () -+{ -+return nanosleep (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_nanosleep=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_nanosleep=no -+fi - -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_nanosleep" >&5 -+$as_echo "$ac_cv_func_nanosleep" >&6; } -+if test "x$ac_cv_func_nanosleep" = x""yes; then -+ : - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 -+ { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 - $as_echo_n "checking for nanosleep in -lrt... " >&6; } --if test "${ac_cv_lib_rt_nanosleep+set}" = set; then : -+if test "${ac_cv_lib_rt_nanosleep+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lrt $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -22001,18 +30859,43 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_rt_nanosleep=yes - else -- ac_cv_lib_rt_nanosleep=no -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_rt_nanosleep=no - fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5 - $as_echo "$ac_cv_lib_rt_nanosleep" >&6; } --if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then : -+if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then - XEPHYR_LIBS="$XEPHYR_LIBS -lrt" - fi - -@@ -22108,7 +30991,11 @@ - - - --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - #include -@@ -22124,11 +31011,36 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define _GNU_SOURCE 1 -+_ACEOF -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --$as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - fi -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -@@ -22191,13 +31103,13 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 - $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) { eval $ac_var=; unset $ac_var;} ;; -+ *) $as_unset $ac_var ;; - esac ;; - esac - done -@@ -22205,8 +31117,8 @@ - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes: double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \. -+ # `set' does not quote correctly, so add quotes (double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -22229,11 +31141,11 @@ - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && -- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 - $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 - $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi -@@ -22253,8 +31165,8 @@ - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. -- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -22270,419 +31182,721 @@ - fi - - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- as_fn_error "conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- as_fn_error "conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then -- as_fn_error "conditional \"am__fastdepCCAS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XSERVER_DTRACE_TRUE}" && test -z "${XSERVER_DTRACE_FALSE}"; then -- as_fn_error "conditional \"XSERVER_DTRACE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XSERVER_DTRACE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XSERVER_DTRACE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SPECIAL_DTRACE_OBJECTS_TRUE}" && test -z "${SPECIAL_DTRACE_OBJECTS_FALSE}"; then -- as_fn_error "conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - - if test -z "${NEED_STRLCAT_TRUE}" && test -z "${NEED_STRLCAT_FALSE}"; then -- as_fn_error "conditional \"NEED_STRLCAT\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_STRLCAT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"NEED_STRLCAT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${NEED_VSNPRINTF_TRUE}" && test -z "${NEED_VSNPRINTF_FALSE}"; then -- as_fn_error "conditional \"NEED_VSNPRINTF\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_VSNPRINTF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"NEED_VSNPRINTF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${AGP_TRUE}" && test -z "${AGP_FALSE}"; then -- as_fn_error "conditional \"AGP\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"AGP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"AGP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${LNXAPM_TRUE}" && test -z "${LNXAPM_FALSE}"; then -- as_fn_error "conditional \"LNXAPM\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LNXAPM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"LNXAPM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${FBDEVHW_TRUE}" && test -z "${FBDEVHW_FALSE}"; then -- as_fn_error "conditional \"FBDEVHW\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"FBDEVHW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"FBDEVHW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${FREEBSD_KLDLOAD_TRUE}" && test -z "${FREEBSD_KLDLOAD_FALSE}"; then -- as_fn_error "conditional \"FREEBSD_KLDLOAD\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"FREEBSD_KLDLOAD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"FREEBSD_KLDLOAD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BSD_APM_TRUE}" && test -z "${BSD_APM_FALSE}"; then -- as_fn_error "conditional \"BSD_APM\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_APM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BSD_APM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BSD_KQUEUE_APM_TRUE}" && test -z "${BSD_KQUEUE_APM_FALSE}"; then -- as_fn_error "conditional \"BSD_KQUEUE_APM\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_KQUEUE_APM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BSD_KQUEUE_APM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${ALPHA_VIDEO_TRUE}" && test -z "${ALPHA_VIDEO_FALSE}"; then -- as_fn_error "conditional \"ALPHA_VIDEO\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"ALPHA_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"ALPHA_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${ARM_VIDEO_TRUE}" && test -z "${ARM_VIDEO_FALSE}"; then -- as_fn_error "conditional \"ARM_VIDEO\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"ARM_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"ARM_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${I386_VIDEO_TRUE}" && test -z "${I386_VIDEO_FALSE}"; then -- as_fn_error "conditional \"I386_VIDEO\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"I386_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"I386_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${PPC_VIDEO_TRUE}" && test -z "${PPC_VIDEO_FALSE}"; then -- as_fn_error "conditional \"PPC_VIDEO\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"PPC_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"PPC_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SPARC64_VIDEO_TRUE}" && test -z "${SPARC64_VIDEO_FALSE}"; then -- as_fn_error "conditional \"SPARC64_VIDEO\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SPARC64_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SPARC64_VIDEO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INSTALL_SETUID_TRUE}" && test -z "${INSTALL_SETUID_FALSE}"; then -- as_fn_error "conditional \"INSTALL_SETUID\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_SETUID\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INSTALL_SETUID\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SECURE_RPC_TRUE}" && test -z "${SECURE_RPC_FALSE}"; then -- as_fn_error "conditional \"SECURE_RPC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SECURE_RPC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SECURE_RPC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INT10_VM86_TRUE}" && test -z "${INT10_VM86_FALSE}"; then -- as_fn_error "conditional \"INT10_VM86\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_VM86\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INT10_VM86\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INT10_X86EMU_TRUE}" && test -z "${INT10_X86EMU_FALSE}"; then -- as_fn_error "conditional \"INT10_X86EMU\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_X86EMU\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INT10_X86EMU\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INT10_STUB_TRUE}" && test -z "${INT10_STUB_FALSE}"; then -- as_fn_error "conditional \"INT10_STUB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_STUB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INT10_STUB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BUILDDOCS_TRUE}" && test -z "${BUILDDOCS_FALSE}"; then -- as_fn_error "conditional \"BUILDDOCS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDDOCS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILDDOCS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then -- as_fn_error "conditional \"BUILD_LINUXDOC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then -- as_fn_error "conditional \"BUILD_PDFDOC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INSTALL_LIBXF86CONFIG_TRUE}" && test -z "${INSTALL_LIBXF86CONFIG_FALSE}"; then -- as_fn_error "conditional \"INSTALL_LIBXF86CONFIG\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then -- as_fn_error "conditional \"HAVE_DBUS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_DBUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${CONFIG_DBUS_API_TRUE}" && test -z "${CONFIG_DBUS_API_FALSE}"; then -- as_fn_error "conditional \"CONFIG_DBUS_API\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_DBUS_API\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"CONFIG_DBUS_API\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${CONFIG_HAL_TRUE}" && test -z "${CONFIG_HAL_FALSE}"; then -- as_fn_error "conditional \"CONFIG_HAL\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_HAL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"CONFIG_HAL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${CONFIG_NEED_DBUS_TRUE}" && test -z "${CONFIG_NEED_DBUS_FALSE}"; then -- as_fn_error "conditional \"CONFIG_NEED_DBUS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_NEED_DBUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"CONFIG_NEED_DBUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XV_TRUE}" && test -z "${XV_FALSE}"; then -- as_fn_error "conditional \"XV\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then -- as_fn_error "conditional \"XVMC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XVMC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XREGISTRY_TRUE}" && test -z "${XREGISTRY_FALSE}"; then -- as_fn_error "conditional \"XREGISTRY\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XREGISTRY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XREGISTRY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${COMPOSITE_TRUE}" && test -z "${COMPOSITE_FALSE}"; then -- as_fn_error "conditional \"COMPOSITE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"COMPOSITE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"COMPOSITE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${MITSHM_TRUE}" && test -z "${MITSHM_FALSE}"; then -- as_fn_error "conditional \"MITSHM\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"MITSHM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"MITSHM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${RECORD_TRUE}" && test -z "${RECORD_FALSE}"; then -- as_fn_error "conditional \"RECORD\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"RECORD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"RECORD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SCREENSAVER_TRUE}" && test -z "${SCREENSAVER_FALSE}"; then -- as_fn_error "conditional \"SCREENSAVER\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SCREENSAVER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SCREENSAVER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${RES_TRUE}" && test -z "${RES_FALSE}"; then -- as_fn_error "conditional \"RES\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"RES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"RES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${GLX_TRUE}" && test -z "${GLX_FALSE}"; then -- as_fn_error "conditional \"GLX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"GLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"GLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${AIGLX_TRUE}" && test -z "${AIGLX_FALSE}"; then -- as_fn_error "conditional \"AIGLX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"AIGLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"AIGLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then -- as_fn_error "conditional \"DRI\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DRI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DRI2_TRUE}" && test -z "${DRI2_FALSE}"; then -- as_fn_error "conditional \"DRI2\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DRI2\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DRI2_AIGLX_TRUE}" && test -z "${DRI2_AIGLX_FALSE}"; then -- as_fn_error "conditional \"DRI2_AIGLX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2_AIGLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DRI2_AIGLX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XINERAMA_TRUE}" && test -z "${XINERAMA_FALSE}"; then -- as_fn_error "conditional \"XINERAMA\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XINERAMA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XINERAMA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XACE_TRUE}" && test -z "${XACE_FALSE}"; then -- as_fn_error "conditional \"XACE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XACE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XACE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XSELINUX_TRUE}" && test -z "${XSELINUX_FALSE}"; then -- as_fn_error "conditional \"XSELINUX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XSELINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XSELINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XCSECURITY_TRUE}" && test -z "${XCSECURITY_FALSE}"; then -- as_fn_error "conditional \"XCSECURITY\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XCSECURITY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XCSECURITY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${MULTIBUFFER_TRUE}" && test -z "${MULTIBUFFER_FALSE}"; then -- as_fn_error "conditional \"MULTIBUFFER\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"MULTIBUFFER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"MULTIBUFFER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DBE_TRUE}" && test -z "${DBE_FALSE}"; then -- as_fn_error "conditional \"DBE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DBE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DBE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XF86BIGFONT_TRUE}" && test -z "${XF86BIGFONT_FALSE}"; then -- as_fn_error "conditional \"XF86BIGFONT\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XF86BIGFONT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XF86BIGFONT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DPMSExtension_TRUE}" && test -z "${DPMSExtension_FALSE}"; then -- as_fn_error "conditional \"DPMSExtension\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DPMSExtension\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DPMSExtension\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XCALIBRATE_TRUE}" && test -z "${XCALIBRATE_FALSE}"; then -- as_fn_error "conditional \"XCALIBRATE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XCALIBRATE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XCALIBRATE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XF86UTILS_TRUE}" && test -z "${XF86UTILS_FALSE}"; then -- as_fn_error "conditional \"XF86UTILS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XF86UTILS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XF86UTILS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XAA_TRUE}" && test -z "${XAA_FALSE}"; then -- as_fn_error "conditional \"XAA\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XAA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XAA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${VGAHW_TRUE}" && test -z "${VGAHW_FALSE}"; then -- as_fn_error "conditional \"VGAHW\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"VGAHW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"VGAHW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${VBE_TRUE}" && test -z "${VBE_FALSE}"; then -- as_fn_error "conditional \"VBE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"VBE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"VBE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${INT10MODULE_TRUE}" && test -z "${INT10MODULE_FALSE}"; then -- as_fn_error "conditional \"INT10MODULE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"INT10MODULE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"INT10MODULE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XDMCP_TRUE}" && test -z "${XDMCP_FALSE}"; then -- as_fn_error "conditional \"XDMCP\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XDMCP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XDMCP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XDMAUTH_TRUE}" && test -z "${XDMAUTH_FALSE}"; then -- as_fn_error "conditional \"XDMAUTH\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XDMAUTH\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XDMAUTH\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then -- as_fn_error "conditional \"DEBUG\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${UNITTESTS_TRUE}" && test -z "${UNITTESTS_FALSE}"; then -- as_fn_error "conditional \"UNITTESTS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"UNITTESTS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"UNITTESTS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XVFB_TRUE}" && test -z "${XVFB_FALSE}"; then -- as_fn_error "conditional \"XVFB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XVFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XVFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XNEST_TRUE}" && test -z "${XNEST_FALSE}"; then -- as_fn_error "conditional \"XNEST\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XNEST\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XNEST\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XORG_TRUE}" && test -z "${XORG_FALSE}"; then -- as_fn_error "conditional \"XORG\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XORG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XORG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XORG_BUS_LINUXPCI_TRUE}" && test -z "${XORG_BUS_LINUXPCI_FALSE}"; then -- as_fn_error "conditional \"XORG_BUS_LINUXPCI\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_LINUXPCI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XORG_BUS_LINUXPCI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XORG_BUS_BSDPCI_TRUE}" && test -z "${XORG_BUS_BSDPCI_FALSE}"; then -- as_fn_error "conditional \"XORG_BUS_BSDPCI\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_BSDPCI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XORG_BUS_BSDPCI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XORG_BUS_SPARC_TRUE}" && test -z "${XORG_BUS_SPARC_FALSE}"; then -- as_fn_error "conditional \"XORG_BUS_SPARC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_SPARC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XORG_BUS_SPARC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${LINUX_IA64_TRUE}" && test -z "${LINUX_IA64_FALSE}"; then -- as_fn_error "conditional \"LINUX_IA64\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_IA64\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"LINUX_IA64\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${LINUX_ALPHA_TRUE}" && test -z "${LINUX_ALPHA_FALSE}"; then -- as_fn_error "conditional \"LINUX_ALPHA\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_ALPHA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"LINUX_ALPHA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${LNXACPI_TRUE}" && test -z "${LNXACPI_FALSE}"; then -- as_fn_error "conditional \"LNXACPI\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LNXACPI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"LNXACPI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SOLARIS_ASM_INLINE_TRUE}" && test -z "${SOLARIS_ASM_INLINE_FALSE}"; then -- as_fn_error "conditional \"SOLARIS_ASM_INLINE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_ASM_INLINE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SOLARIS_ASM_INLINE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${SOLARIS_VT_TRUE}" && test -z "${SOLARIS_VT_FALSE}"; then -- as_fn_error "conditional \"SOLARIS_VT\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_VT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"SOLARIS_VT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DGA_TRUE}" && test -z "${DGA_FALSE}"; then -- as_fn_error "conditional \"DGA\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DGA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DGA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XF86VIDMODE_TRUE}" && test -z "${XF86VIDMODE_FALSE}"; then -- as_fn_error "conditional \"XF86VIDMODE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XF86VIDMODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XF86VIDMODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_TRUE}" && test -z "${XWIN_FALSE}"; then -- as_fn_error "conditional \"XWIN\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_MULTIWINDOW_TRUE}" && test -z "${XWIN_MULTIWINDOW_FALSE}"; then -- as_fn_error "conditional \"XWIN_MULTIWINDOW\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOW\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_MULTIWINDOWEXTWM_TRUE}" && test -z "${XWIN_MULTIWINDOWEXTWM_FALSE}"; then -- as_fn_error "conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_CLIPBOARD_TRUE}" && test -z "${XWIN_CLIPBOARD_FALSE}"; then -- as_fn_error "conditional \"XWIN_CLIPBOARD\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_CLIPBOARD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_CLIPBOARD\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_GLX_WINDOWS_TRUE}" && test -z "${XWIN_GLX_WINDOWS_FALSE}"; then -- as_fn_error "conditional \"XWIN_GLX_WINDOWS\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_GLX_WINDOWS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_GLX_WINDOWS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_NATIVEGDI_TRUE}" && test -z "${XWIN_NATIVEGDI_FALSE}"; then -- as_fn_error "conditional \"XWIN_NATIVEGDI\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_NATIVEGDI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_NATIVEGDI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_PRIMARYFB_TRUE}" && test -z "${XWIN_PRIMARYFB_FALSE}"; then -- as_fn_error "conditional \"XWIN_PRIMARYFB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_PRIMARYFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_PRIMARYFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_RANDR_TRUE}" && test -z "${XWIN_RANDR_FALSE}"; then -- as_fn_error "conditional \"XWIN_RANDR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_RANDR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_RANDR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XWIN_XV_TRUE}" && test -z "${XWIN_XV_FALSE}"; then -- as_fn_error "conditional \"XWIN_XV\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_XV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XWIN_XV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then -- as_fn_error "conditional \"am__fastdepOBJC\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepOBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XQUARTZ_TRUE}" && test -z "${XQUARTZ_FALSE}"; then -- as_fn_error "conditional \"XQUARTZ\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XQUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XQUARTZ_SPARKLE_TRUE}" && test -z "${XQUARTZ_SPARKLE_FALSE}"; then -- as_fn_error "conditional \"XQUARTZ_SPARKLE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ_SPARKLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XQUARTZ_SPARKLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${STANDALONE_XPBPROXY_TRUE}" && test -z "${STANDALONE_XPBPROXY_FALSE}"; then -- as_fn_error "conditional \"STANDALONE_XPBPROXY\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"STANDALONE_XPBPROXY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"STANDALONE_XPBPROXY\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DMX_TRUE}" && test -z "${DMX_FALSE}"; then -- as_fn_error "conditional \"DMX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DMX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DMX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then -- as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOXYGEN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_DOXYGEN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DMX_BUILD_LNX_TRUE}" && test -z "${DMX_BUILD_LNX_FALSE}"; then -- as_fn_error "conditional \"DMX_BUILD_LNX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_LNX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DMX_BUILD_LNX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${DMX_BUILD_USB_TRUE}" && test -z "${DMX_BUILD_USB_FALSE}"; then -- as_fn_error "conditional \"DMX_BUILD_USB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_USB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"DMX_BUILD_USB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${KDRIVE_TRUE}" && test -z "${KDRIVE_FALSE}"; then -- as_fn_error "conditional \"KDRIVE\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"KDRIVE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then -- as_fn_error "conditional \"KDRIVELINUX\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then -- as_fn_error "conditional \"TSLIB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"TSLIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"TSLIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${KDRIVEVESA_TRUE}" && test -z "${KDRIVEVESA_FALSE}"; then -- as_fn_error "conditional \"KDRIVEVESA\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEVESA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"KDRIVEVESA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${KDRIVEFBDEV_TRUE}" && test -z "${KDRIVEFBDEV_FALSE}"; then -- as_fn_error "conditional \"KDRIVEFBDEV\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEFBDEV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"KDRIVEFBDEV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XEPHYR_TRUE}" && test -z "${XEPHYR_FALSE}"; then -- as_fn_error "conditional \"XEPHYR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XEPHYR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XEPHYR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${BUILD_KDRIVEFBDEVLIB_TRUE}" && test -z "${BUILD_KDRIVEFBDEVLIB_FALSE}"; then -- as_fn_error "conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - if test -z "${XFAKESERVER_TRUE}" && test -z "${XFAKESERVER_FALSE}"; then -- as_fn_error "conditional \"XFAKESERVER\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"XFAKESERVER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"XFAKESERVER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } - fi - - : ${CONFIG_STATUS=./config.status} - ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 - $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} --as_write_fail=0 --cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -22692,18 +31906,17 @@ - debug=false - ac_cs_recheck=false - ac_cs_silent=false -- - SHELL=\${CONFIG_SHELL-$SHELL} --export SHELL --_ASEOF --cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 --## -------------------- ## --## M4sh Initialization. ## --## -------------------- ## -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -22711,15 +31924,23 @@ - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in #( -- *posix*) : -- set -o posix ;; #( -- *) : -- ;; -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; - esac -+ - fi - - -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ - as_nl=' - ' - export as_nl -@@ -22727,13 +31948,7 @@ - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --# Prefer a ksh shell builtin over an external printf program on Solaris, --# but without wasting forks for bash or zsh. --if test -z "$BASH_VERSION$ZSH_VERSION" \ -- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='print -r --' -- as_echo_n='print -rn --' --elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -22744,7 +31959,7 @@ - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in #( -+ case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -22767,6 +31982,13 @@ - } - fi - -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -22776,15 +31998,15 @@ - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in #(( -+case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -- done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done - IFS=$as_save_IFS - - ;; -@@ -22796,16 +32018,12 @@ - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- exit 1 -+ { (exit 1); exit 1; } - fi - --# Unset variables that we do not need and which cause bugs (e.g. in --# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" --# suppresses any "Segmentation fault" message there. '((' could --# trigger a bug in pdksh 5.2.14. --for as_var in BASH_ENV ENV MAIL MAILPATH --do eval test x\${$as_var+set} = xset \ -- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - PS1='$ ' - PS2='> ' -@@ -22817,89 +32035,7 @@ - LANGUAGE=C - export LANGUAGE - --# CDPATH. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- -- --# as_fn_error ERROR [LINENO LOG_FD] --# --------------------------------- --# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are --# provided, also output the error to LOG_FD, referencing LINENO. Then exit the --# script with status $?, using 1 if that was 0. --as_fn_error () --{ -- as_status=$?; test $as_status -eq 0 && as_status=1 -- if test "$3"; then -- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -- fi -- $as_echo "$as_me: error: $1" >&2 -- as_fn_exit $as_status --} # as_fn_error -- -- --# as_fn_set_status STATUS --# ----------------------- --# Set $? to STATUS, without forking. --as_fn_set_status () --{ -- return $1 --} # as_fn_set_status -- --# as_fn_exit STATUS --# ----------------- --# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. --as_fn_exit () --{ -- set +e -- as_fn_set_status $1 -- exit $1 --} # as_fn_exit -- --# as_fn_unset VAR --# --------------- --# Portably unset VAR. --as_fn_unset () --{ -- { eval $1=; unset $1;} --} --as_unset=as_fn_unset --# as_fn_append VAR VALUE --# ---------------------- --# Append the text in VALUE to the end of the definition contained in VAR. Take --# advantage of any shell optimizations that allow amortized linear growth over --# repeated appends, instead of the typical quadratic growth present in naive --# implementations. --if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -- eval 'as_fn_append () -- { -- eval $1+=\$2 -- }' --else -- as_fn_append () -- { -- eval $1=\$$1\$2 -- } --fi # as_fn_append -- --# as_fn_arith ARG... --# ------------------ --# Perform arithmetic evaluation on the ARGs, and store the result in the --# global $as_val. Take advantage of shells that can avoid forks. The arguments --# must be portable across $(()) and expr. --if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -- eval 'as_fn_arith () -- { -- as_val=$(( $* )) -- }' --else -- as_fn_arith () -- { -- as_val=`expr "$@" || test $? -eq 1` -- } --fi # as_fn_arith -- -- -+# Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -22913,12 +32049,8 @@ - as_basename=false - fi - --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi - -+# Name of the executable. - as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -@@ -22938,25 +32070,76 @@ - } - s/.*/./; q'` - --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - - ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in #((((( -+case `echo -n x` in - -n*) -- case `echo 'xy\c'` in -+ case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- xy) ECHO_C='\c';; -- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -- ECHO_T=' ';; -+ *) ECHO_C='\c';; - esac;; - *) - ECHO_N='-n';; - esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi - - rm -f conf$$ conf$$.exe conf$$.file - if test -d conf$$.dir; then -@@ -22985,56 +32168,8 @@ - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null - -- --# as_fn_mkdir_p --# ------------- --# Create "$as_dir" as a directory, including parents if necessary. --as_fn_mkdir_p () --{ -- -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || eval $as_mkdir_p || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -- -- --} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p='mkdir -p "$as_dir"' -+ as_mkdir_p=: - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -@@ -23053,10 +32188,10 @@ - if test -d "$1"; then - test -d "$1/."; - else -- case $1 in #( -+ case $1 in - -*)set "./$1";; - esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -@@ -23071,19 +32206,13 @@ - - - exec 6>&1 --## ----------------------------------- ## --## Main body of $CONFIG_STATUS script. ## --## ----------------------------------- ## --_ASEOF --test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --# Save the log message, to keep $0 and so on meaningful, and to -+# Save the log message, to keep $[0] and so on meaningful, and to - # 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.1, which was --generated by GNU Autoconf 2.64. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -23115,11 +32244,10 @@ - - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files and other configuration actions --from templates according to the current configuration. Unless the files --and actions are specified as TAGs, all are instantiated by default. -+\`$as_me' instantiates files from templates according to the -+current configuration. - --Usage: $0 [OPTION]... [TAG]... -+Usage: $0 [OPTION]... [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -@@ -23141,16 +32269,16 @@ - Configuration commands: - $config_commands - --Report bugs to ." -+Report bugs to ." - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - xorg-server config.status 1.7.99.1 --configured by $0, generated by GNU Autoconf 2.64, -+configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2008 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -23193,19 +32321,20 @@ - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac -- as_fn_append CONFIG_FILES " '$ac_optarg'" -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac -- as_fn_append CONFIG_HEADERS " '$ac_optarg'" -+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- as_fn_error "ambiguous option: \`$1' --Try \`$0 --help' for more information.";; -+ { $as_echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -23213,10 +32342,11 @@ - ac_cs_silent=: ;; - - # This is an error. -- -*) as_fn_error "unrecognized option: \`$1' --Try \`$0 --help' for more information." ;; -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } ;; - -- *) as_fn_append ac_config_targets " $1" -+ *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac -@@ -23623,7 +32753,9 @@ - "test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;; - "xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;; - -- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ { (exit 1); exit 1; }; };; - esac - done - -@@ -23650,7 +32782,7 @@ - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status - ' 0 -- trap 'as_fn_exit 1' 1 2 13 15 -+ trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - # Create a (secure) tmp directory for tmp files. - -@@ -23661,7 +32793,11 @@ - { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") --} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -+} || -+{ -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } -+} - - # Set up the scripts for CONFIG_FILES section. - # No need to generate them if there are no CONFIG_FILES. -@@ -23669,16 +32805,10 @@ - if test -n "$CONFIG_FILES"; then - - --ac_cr=`echo X | tr X '\015'` --# On cygwin, bash can eat \r inside `` if the user requested igncr. --# But we know of no other shell where ac_cr would be empty at this --# point, so we can use a bashism as a fallback. --if test "x$ac_cr" = x; then -- eval ac_cr=\$\'\\r\' --fi -+ac_cr=' ' - ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` - if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -- ac_cs_awk_cr='\r' -+ ac_cs_awk_cr='\\r' - else - ac_cs_awk_cr=$ac_cr - fi -@@ -23692,18 +32822,24 @@ - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" - } >conf$$subs.sh || -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -23792,7 +32928,9 @@ - else - cat - fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || as_fn_error "could not setup config files machinery" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+ { (exit 1); exit 1; }; } - _ACEOF - - # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -23833,7 +32971,9 @@ - if test -z "$ac_t"; then - break - elif $ac_last_try; then -- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -+ { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -23918,7 +33058,9 @@ - _ACAWK - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- as_fn_error "could not setup config headers machinery" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -+$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -+ { (exit 1); exit 1; }; } - fi # test -n "$CONFIG_HEADERS" - - -@@ -23931,7 +33073,9 @@ - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -+ { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -23959,10 +33103,12 @@ - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -- as_fn_append ac_file_inputs " '$ac_f'" -+ ac_file_inputs="$ac_file_inputs '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -23973,7 +33119,7 @@ - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 - $as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. -@@ -23986,7 +33132,9 @@ - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; - esac - ;; - esac -@@ -24014,7 +33162,47 @@ - q - } - s/.*/./; q'` -- as_dir="$ac_dir"; as_fn_mkdir_p -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } - ac_builddir=. - - case "$ac_dir" in -@@ -24071,6 +33259,7 @@ - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= -+ - ac_sed_dataroot=' - /datarootdir/ { - p -@@ -24080,11 +33269,12 @@ - /@docdir@/p - /@infodir@/p - /@localedir@/p --/@mandir@/p' -+/@mandir@/p -+' - case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 - $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -24094,7 +33284,7 @@ - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g -- s&\\\${datarootdir}&$datarootdir&g' ;; -+ s&\\\${datarootdir}&$datarootdir&g' ;; - esac - _ACEOF - -@@ -24123,12 +33313,14 @@ - $ac_datarootdir_hack - " - eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 - $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&2;} -@@ -24138,7 +33330,9 @@ - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - ;; - :H) - # -@@ -24149,19 +33343,25 @@ - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - $as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -- || as_fn_error "could not create -" "$LINENO" 5 -+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -+$as_echo "$as_me: error: could not create -" >&2;} -+ { (exit 1); exit 1; }; } - fi - # Compute "$ac_file"'s index in $config_headers. - _am_arg="$ac_file" -@@ -24199,7 +33399,7 @@ - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - -- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 - $as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac -@@ -24294,7 +33494,47 @@ - q - } - s/.*/./; q'` -- as_dir=$dirpart/$fdir; as_fn_mkdir_p -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -@@ -24947,12 +34187,15 @@ - done # for ac_tag - - --as_fn_exit 0 -+{ (exit 0); exit 0; } - _ACEOF -+chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - - test $ac_write_fail = 0 || -- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - - - # configure is writing to config.log, and then calls config.status. -@@ -24973,10 +34216,10 @@ - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || as_fn_exit $? -+ $ac_cs_success || { (exit 1); exit 1; } - fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - -diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configure.ac ---- xorg-server-1.7.99.1/configure.ac 2009-10-21 18:06:54.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/configure.ac 2009-10-24 10:51:17.074488205 +0200 -@@ -501,9 +501,9 @@ +diff -Naur xorg-server-20091215/configure.ac xorg-server-20091215.patch/configure.ac +--- xorg-server-20091215/configure.ac 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/configure.ac 2009-12-15 20:15:56.495321458 +0100 +@@ -519,9 +519,9 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) @@ -33516,7 +46,7 @@ diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configur AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], [Keyboard ruleset (default: base/evdev)]), [ XKB_DFLT_RULES="$withval" ], -@@ -1099,7 +1099,7 @@ +@@ -1117,7 +1117,7 @@ dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then @@ -33525,9 +55,11 @@ diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configur fi dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -diff -Naur xorg-server-1.7.99.1/xkb/ddxLoad.c xorg-server-1.7.99.1.patch/xkb/ddxLoad.c ---- xorg-server-1.7.99.1/xkb/ddxLoad.c 2009-10-21 15:46:53.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/ddxLoad.c 2009-10-24 10:50:23.303364966 +0200 +diff -Naur xorg-server-20091215/configure.ac.orig xorg-server-20091215.patch/configure.ac.orig +diff -Naur xorg-server-20091215/include/do-not-use-config.h.in~ xorg-server-20091215.patch/include/do-not-use-config.h.in~ +diff -Naur xorg-server-20091215/xkb/ddxLoad.c xorg-server-20091215.patch/xkb/ddxLoad.c +--- xorg-server-20091215/xkb/ddxLoad.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/xkb/ddxLoad.c 2009-12-15 20:15:56.496321229 +0100 @@ -30,6 +30,13 @@ #include @@ -33818,9 +350,9 @@ diff -Naur xorg-server-1.7.99.1/xkb/ddxLoad.c xorg-server-1.7.99.1.patch/xkb/ddx return (need|want)&(~missing); } -diff -Naur xorg-server-1.7.99.1/xkb/README.compiled xorg-server-1.7.99.1.patch/xkb/README.compiled ---- xorg-server-1.7.99.1/xkb/README.compiled 2008-10-13 01:19:06.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/README.compiled 2009-10-24 10:50:28.069400854 +0200 +diff -Naur xorg-server-20091215/xkb/README.compiled xorg-server-20091215.patch/xkb/README.compiled +--- xorg-server-20091215/xkb/README.compiled 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/xkb/README.compiled 2009-12-15 20:15:56.496321229 +0100 @@ -4,10 +4,10 @@ or some other tool might destroy or replace the files in this directory, so it is not a safe place to store compiled keymaps for long periods of diff --git a/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff b/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff deleted file mode 100644 index 6945fc5c83..0000000000 --- a/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff +++ /dev/null @@ -1,8800 +0,0 @@ -diff -Naur xorg-server-1.7.99.1/aclocal.m4 xorg-server-1.7.99.1.patch/aclocal.m4 ---- xorg-server-1.7.99.1/aclocal.m4 2009-10-21 18:07:05.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/aclocal.m4 2009-11-15 21:03:44.663231150 +0100 -@@ -13,8 +13,8 @@ - - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, --[m4_warning([this file was generated for autoconf 2.64. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -+[m4_warning([this file was generated for autoconf 2.63. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) -@@ -87,16 +87,14 @@ - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) - # --------------------------------------------- - m4_define([_PKG_CONFIG], --[if test -n "$PKG_CONFIG"; then -- if test -n "$$1"; then -- pkg_cv_[]$1="$$1" -- else -- PKG_CHECK_EXISTS([$3], -- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -- [pkg_failed=yes]) -- fi --else -- pkg_failed=untried -+[if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ elif test -n "$PKG_CONFIG"; then -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ else -+ pkg_failed=untried - fi[]dnl - ])# _PKG_CONFIG - -@@ -140,9 +138,9 @@ - if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then -- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else -- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -@@ -177,1749 +175,1748 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - --# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --# (This private macro should not be called outside this file.) --AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.11' --dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to --dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11], [], -- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl --]) -- --# _AM_AUTOCONF_VERSION(VERSION) --# ----------------------------- --# aclocal traces this macro to find the Autoconf version. --# This is a private macro too. Using m4_define simplifies --# the logic in aclocal, which can simply ignore this definition. --m4_define([_AM_AUTOCONF_VERSION], []) -- --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. --# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11])dnl --m4_ifndef([AC_AUTOCONF_VERSION], -- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- --# Figure out how to run the assembler. -*- Autoconf -*- -- --# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 5 -- --# AM_PROG_AS --# ---------- --AC_DEFUN([AM_PROG_AS], --[# By default we simply use the C compiler to build assembly code. --AC_REQUIRE([AC_PROG_CC]) --test "${CCAS+set}" = set || CCAS=$CC --test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS --AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) --AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) --_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl --]) -- --# AM_AUX_DIR_EXPAND -*- Autoconf -*- -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. -+dnl -+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. -+dnl -+dnl Permission is hereby granted, free of charge, to any person obtaining a -+dnl copy of this software and associated documentation files (the -+dnl "Software"), to deal in the Software without restriction, including -+dnl without limitation the rights to use, copy, modify, merge, publish, -+dnl distribute, and/or sell copies of the Software, and to permit persons -+dnl to whom the Software is furnished to do so, provided that the above -+dnl copyright notice(s) and this permission notice appear in all copies of -+dnl the Software and that both the above copyright notice(s) and this -+dnl permission notice appear in supporting documentation. -+dnl -+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+dnl -+dnl Except as contained in this notice, the name of a copyright holder -+dnl shall not be used in advertising or otherwise to promote the sale, use -+dnl or other dealings in this Software without prior written authorization -+dnl of the copyright holder. - --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. -+# XORG_MACROS_VERSION(required-version) -+# ------------------------------------- -+# Minimum version: 1.1.0 - # --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir -+# If you're using a macro added in Version 1.1 or newer, include this in -+# your configure.ac with the minimum required version, such as: -+# XORG_MACROS_VERSION(1.1) - # --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. -+# To ensure that this macro is defined, also add: -+# m4_ifndef([XORG_MACROS_VERSION], -+# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) - # --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. - # --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --AC_DEFUN([AM_AUX_DIR_EXPAND], --[dnl Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50])dnl --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` --]) -- --# AM_CONDITIONAL -*- Autoconf -*- -+# See the "minimum version" comment for each macro you use to see what -+# version you require. -+m4_defun([XORG_MACROS_VERSION],[ -+m4_define([vers_have], [1.3.0]) -+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) -+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) -+m4_if(m4_cmp(maj_have, maj_needed), 0,, -+ [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) -+m4_if(m4_version_compare(vers_have, [$1]), -1, -+ [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) -+m4_undefine([vers_have]) -+m4_undefine([maj_have]) -+m4_undefine([maj_needed]) -+]) # XORG_MACROS_VERSION - --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 --# Free Software Foundation, Inc. -+# XORG_PROG_RAWCPP() -+# ------------------ -+# Minimum version: 1.0.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Find cpp program and necessary flags for use in pre-processing text files -+# such as man pages and config files -+AC_DEFUN([XORG_PROG_RAWCPP],[ -+AC_REQUIRE([AC_PROG_CPP]) -+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], -+ [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - --# serial 9 -+# Check for flag to avoid builtin definitions - assumes unix is predefined, -+# which is not the best choice for supporting other OS'es, but covers most -+# of the ones we need for now. -+AC_MSG_CHECKING([if $RAWCPP requires -undef]) -+AC_LANG_CONFTEST([Does cpp redefine unix ?]) -+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ AC_MSG_RESULT([no]) -+else -+ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ RAWCPPFLAGS=-undef -+ AC_MSG_RESULT([yes]) -+ # under Cygwin unix is still defined even with -undef -+ elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -+ RAWCPPFLAGS="-undef -ansi" -+ AC_MSG_RESULT([yes, with -ansi]) -+ else -+ AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) -+ fi -+fi -+rm -f conftest.$ac_ext - --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ(2.52)dnl -- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE])dnl --AC_SUBST([$1_FALSE])dnl --_AM_SUBST_NOTMAKE([$1_TRUE])dnl --_AM_SUBST_NOTMAKE([$1_FALSE])dnl --m4_define([_AM_COND_VALUE_$1], [$2])dnl --if $2; then -- $1_TRUE= -- $1_FALSE='#' -+AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -+AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) -+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -+ AC_MSG_RESULT([no]) - else -- $1_TRUE='#' -- $1_FALSE= -+ if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -+ RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) -+ fi - fi --AC_CONFIG_COMMANDS_PRE( --[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([[conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]]) --fi])]) -+rm -f conftest.$ac_ext -+AC_SUBST(RAWCPPFLAGS) -+]) # XORG_PROG_RAWCPP - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 --# Free Software Foundation, Inc. -+# XORG_MANPAGE_SECTIONS() -+# ----------------------- -+# Minimum version: 1.0.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 10 -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+# Determine which sections man pages go in for the different man page types -+# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. -+# Not sure if there's any better way than just hardcoding by OS name. -+# Override default settings by setting environment variables - -+AC_DEFUN([XORG_MANPAGE_SECTIONS],[ -+AC_REQUIRE([AC_CANONICAL_HOST]) - --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -+if test x$APP_MAN_SUFFIX = x ; then -+ APP_MAN_SUFFIX=1 -+fi -+if test x$APP_MAN_DIR = x ; then -+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -+fi - --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], UPC, [depcc="$UPC" am_compiler_list=], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+if test x$LIB_MAN_SUFFIX = x ; then -+ LIB_MAN_SUFFIX=3 -+fi -+if test x$LIB_MAN_DIR = x ; then -+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -+fi - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+if test x$FILE_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) FILE_MAN_SUFFIX=4 ;; -+ *) FILE_MAN_SUFFIX=5 ;; -+ esac -+fi -+if test x$FILE_MAN_DIR = x ; then -+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -+fi - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- am__universal=false -- m4_case([$1], [CC], -- [case " $depcc " in #( -- *\ -arch\ *\ -arch\ *) am__universal=true ;; -- esac], -- [CXX], -- [case " $depcc " in #( -- *\ -arch\ *\ -arch\ *) am__universal=true ;; -- esac]) -+if test x$MISC_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) MISC_MAN_SUFFIX=5 ;; -+ *) MISC_MAN_SUFFIX=7 ;; -+ esac -+fi -+if test x$MISC_MAN_DIR = x ; then -+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -+fi - -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+if test x$DRIVER_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) DRIVER_MAN_SUFFIX=7 ;; -+ *) DRIVER_MAN_SUFFIX=4 ;; -+ esac -+fi -+if test x$DRIVER_MAN_DIR = x ; then -+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -+fi - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -- am__obj=sub/conftest.${OBJEXT-o} -- am__minus_obj="-o $am__obj" -- case $depmode in -- gcc) -- # This depmode causes a compiler race in universal mode. -- test "$am__universal" = false || continue -- ;; -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -- # not run yet. These depmodes are late enough in the game, and -- # so weak that their functioning should not be impacted. -- am__obj=conftest.${OBJEXT-o} -- am__minus_obj= -- ;; -- none) break ;; -+if test x$ADMIN_MAN_SUFFIX = x ; then -+ case $host_os in -+ solaris*) ADMIN_MAN_SUFFIX=1m ;; -+ *) ADMIN_MAN_SUFFIX=8 ;; - esac -- if depmode=$depmode \ -- source=sub/conftest.c object=$am__obj \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done -+fi -+if test x$ADMIN_MAN_DIR = x ; then -+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -+fi - -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none -+ -+AC_SUBST([APP_MAN_SUFFIX]) -+AC_SUBST([LIB_MAN_SUFFIX]) -+AC_SUBST([FILE_MAN_SUFFIX]) -+AC_SUBST([MISC_MAN_SUFFIX]) -+AC_SUBST([DRIVER_MAN_SUFFIX]) -+AC_SUBST([ADMIN_MAN_SUFFIX]) -+AC_SUBST([APP_MAN_DIR]) -+AC_SUBST([LIB_MAN_DIR]) -+AC_SUBST([FILE_MAN_DIR]) -+AC_SUBST([MISC_MAN_DIR]) -+AC_SUBST([DRIVER_MAN_DIR]) -+AC_SUBST([ADMIN_MAN_DIR]) -+]) # XORG_MANPAGE_SECTIONS -+ -+# XORG_CHECK_LINUXDOC -+# ------------------- -+# Minimum version: 1.0.0 -+# -+# Defines the variable MAKE_TEXT if the necessary tools and -+# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. -+# Whether or not the necessary tools and files are found can be checked -+# with the AM_CONDITIONAL "BUILD_LINUXDOC" -+AC_DEFUN([XORG_CHECK_LINUXDOC],[ -+if test x$XORG_SGML_PATH = x ; then -+ XORG_SGML_PATH=$prefix/share/sgml - fi --]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -+HAVE_DEFS_ENT= - -+if test x"$cross_compiling" = x"yes" ; then -+ HAVE_DEFS_ENT=no -+else -+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -+fi - --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -+AC_PATH_PROG(LINUXDOC, linuxdoc) -+AC_PATH_PROG(PS2PDF, ps2pdf) - -+AC_MSG_CHECKING([Whether to build documentation]) - --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' -+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then -+ BUILDDOC=yes -+else -+ BUILDDOC=no - fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH])dnl --_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl --]) - --# Generate code to set up dependency tracking. -*- Autoconf -*- -+AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+AC_MSG_RESULT([$BUILDDOC]) - --#serial 5 -+AC_MSG_CHECKING([Whether to build pdf documentation]) - --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[{ -- # Autoconf 2.62 quotes --file arguments for eval, but not when files -- # are listed without --file. Let's play safe and only enable the eval -- # if we detect the quoting. -- case $CONFIG_FILES in -- *\'*) eval set x "$CONFIG_FILES" ;; -- *) set x $CONFIG_FILES ;; -- esac -- shift -- for mf -- do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. -- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -- test -z "$DEPDIR" && continue -- am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` -- # Find all dependency output files, they are included files with -- # $(DEPDIR) in their names. We invoke sed twice because it is the -- # simplest approach to changing $(DEPDIR) to its actual value in the -- # expansion. -- for file in `sed -n " -- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done -- done --} --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then -+ BUILDPDFDOC=yes -+else -+ BUILDPDFDOC=no -+fi - -+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) - --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) -+AC_MSG_RESULT([$BUILDPDFDOC]) - --# Do all the work for Automake. -*- Autoconf -*- -+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -+MAKE_PDF="$PS2PDF" -+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -+AC_SUBST(MAKE_TEXT) -+AC_SUBST(MAKE_PS) -+AC_SUBST(MAKE_PDF) -+AC_SUBST(MAKE_HTML) -+]) # XORG_CHECK_LINUXDOC -+ -+# XORG_CHECK_DOCBOOK -+# ------------------- -+# Minimum version: 1.0.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Checks for the ability to build output formats from SGML DocBook source. -+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" -+# indicates whether the necessary tools and files are found and, if set, -+# $(MAKE_XXX) blah.sgml will produce blah.xxx. -+AC_DEFUN([XORG_CHECK_DOCBOOK],[ -+if test x$XORG_SGML_PATH = x ; then -+ XORG_SGML_PATH=$prefix/share/sgml -+fi -+HAVE_DEFS_ENT= -+BUILDTXTDOC=no -+BUILDPDFDOC=no -+BUILDPSDOC=no -+BUILDHTMLDOC=no - --# serial 16 -+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - --# This macro actually does too much. Some checks are only needed if --# your package does certain things. But this isn't really a big deal. -+AC_PATH_PROG(DOCBOOKPS, docbook2ps) -+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) -+AC_PATH_PROG(DOCBOOKHTML, docbook2html) -+AC_PATH_PROG(DOCBOOKTXT, docbook2txt) - --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.62])dnl --dnl Autoconf wants to disallow AM_ names. We explicitly allow --dnl the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl --AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl --AC_REQUIRE([AC_PROG_INSTALL])dnl --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -- fi -+AC_MSG_CHECKING([Whether to build text documentation]) -+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && -+ test x$BUILD_TXTDOC != xno; then -+ BUILDTXTDOC=yes - fi -+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) -+AC_MSG_RESULT([$BUILDTXTDOC]) - --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -- else -- CYGPATH_W=echo -- fi -+AC_MSG_CHECKING([Whether to build PDF documentation]) -+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && -+ test x$BUILD_PDFDOC != xno; then -+ BUILDPDFDOC=yes - fi --AC_SUBST([CYGPATH_W]) -- --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl --dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) -+AC_MSG_RESULT([$BUILDPDFDOC]) - --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+AC_MSG_CHECKING([Whether to build PostScript documentation]) -+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && -+ test x$BUILD_PSDOC != xno; then -+ BUILDPSDOC=yes -+fi -+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) -+AC_MSG_RESULT([$BUILDPSDOC]) - --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl --AC_REQUIRE([AM_PROG_MKDIR_P])dnl --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl --_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -- [_AM_PROG_TAR([v7])])]) --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES(OBJC)], -- [define([AC_PROG_OBJC], -- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl --]) --_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl --dnl The `parallel-tests' driver may need to know about EXEEXT, so add the --dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro --dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. --AC_CONFIG_COMMANDS_PRE(dnl --[m4_provide_if([_AM_COMPILER_EXEEXT], -- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl --]) -+AC_MSG_CHECKING([Whether to build HTML documentation]) -+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && -+ test x$BUILD_HTMLDOC != xno; then -+ BUILDHTMLDOC=yes -+fi -+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) -+AC_MSG_RESULT([$BUILDHTMLDOC]) - --dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not --dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further --dnl mangled by Autoconf and run in a shell conditional statement. --m4_define([_AC_COMPILER_EXEEXT], --m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" -+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" -+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" -+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" - -+AC_SUBST(MAKE_TEXT) -+AC_SUBST(MAKE_PS) -+AC_SUBST(MAKE_PDF) -+AC_SUBST(MAKE_HTML) -+]) # XORG_CHECK_DOCBOOK - --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. -+# XORG_CHECK_MALLOC_ZERO -+# ---------------------- -+# Minimum version: 1.0.0 -+# -+# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if -+# malloc(0) returns NULL. Packages should add one of these cflags to -+# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. -+AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ -+AC_ARG_ENABLE(malloc0returnsnull, -+ AS_HELP_STRING([--enable-malloc0returnsnull], -+ [malloc(0) returns NULL (default: auto)]), -+ [MALLOC_ZERO_RETURNS_NULL=$enableval], -+ [MALLOC_ZERO_RETURNS_NULL=auto]) - --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_arg=$1 --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $_am_arg | $_am_arg:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -- --# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --if test x"${install_sh}" != xset; then -- case $am_aux_dir in -- *\ * | *\ *) -- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; -- *) -- install_sh="\${SHELL} $am_aux_dir/install-sh" -- esac -+AC_MSG_CHECKING([whether malloc(0) returns NULL]) -+if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then -+ AC_RUN_IFELSE([ -+char *malloc(); -+char *realloc(); -+char *calloc(); -+main() { -+ char *m0, *r0, *c0, *p; -+ m0 = malloc(0); -+ p = malloc(10); -+ r0 = realloc(p,0); -+ c0 = calloc(0); -+ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -+}], -+ [MALLOC_ZERO_RETURNS_NULL=yes], -+ [MALLOC_ZERO_RETURNS_NULL=no]) - fi --AC_SUBST(install_sh)]) -- --# Copyright (C) 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 2 -+AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) - --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. -+if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then -+ MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" -+ XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS -+ XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" - else -- am__leading_dot=_ -+ MALLOC_ZERO_CFLAGS="" -+ XMALLOC_ZERO_CFLAGS="" -+ XTMALLOC_ZERO_CFLAGS="" - fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) - --# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- --# From Jim Meyering -+AC_SUBST([MALLOC_ZERO_CFLAGS]) -+AC_SUBST([XMALLOC_ZERO_CFLAGS]) -+AC_SUBST([XTMALLOC_ZERO_CFLAGS]) -+]) # XORG_CHECK_MALLOC_ZERO - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. -+# XORG_WITH_LINT() -+# ---------------- -+# Minimum version: 1.1.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 5 -+# Sets up flags for source checkers such as lint and sparse if --with-lint -+# is specified. (Use --with-lint=sparse for sparse.) -+# Sets $LINT to name of source checker passed with --with-lint (default: lint) -+# Sets $LINT_FLAGS to flags to pass to source checker -+# Sets LINT automake conditional if enabled (default: disabled) -+# -+AC_DEFUN([XORG_WITH_LINT],[ - --# AM_MAINTAINER_MODE([DEFAULT-MODE]) --# ---------------------------------- --# Control maintainer-specific portions of Makefiles. --# Default is to disable them, unless `enable' is passed literally. --# For symmetry, `disable' may be passed as well. Anyway, the user --# can override the default with the --enable/--disable switch. --AC_DEFUN([AM_MAINTAINER_MODE], --[m4_case(m4_default([$1], [disable]), -- [enable], [m4_define([am_maintainer_other], [disable])], -- [disable], [m4_define([am_maintainer_other], [enable])], -- [m4_define([am_maintainer_other], [enable]) -- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) --AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) -- dnl maintainer-mode's default is 'disable' unless 'enable' is passed -- AC_ARG_ENABLE([maintainer-mode], --[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- [USE_MAINTAINER_MODE=$enableval], -- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST([MAINT])dnl --] --) -+# Allow checking code with lint, sparse, etc. -+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], -+ [Use a lint-style source code checker (default: disabled)])], -+ [use_lint=$withval], [use_lint=no]) -+if test "x$use_lint" = "xyes" ; then -+ LINT="lint" -+else -+ LINT="$use_lint" -+fi -+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then -+ case $LINT in -+ lint|*/lint) -+ case $host_os in -+ solaris*) -+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" -+ ;; -+ esac -+ ;; -+ esac -+fi - --AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+AC_SUBST(LINT) -+AC_SUBST(LINT_FLAGS) -+AM_CONDITIONAL(LINT, [test x$LINT != xno]) - --# Check to see how 'make' treats includes. -*- Autoconf -*- -+]) # XORG_WITH_LINT - --# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -+# XORG_LINT_LIBRARY(LIBNAME) -+# -------------------------- -+# Minimum version: 1.1.0 -+# -+# Sets up flags for building lint libraries for checking programs that call -+# functions in the library. -+# Disabled by default, enable with --enable-lint-library -+# Sets: -+# @LINTLIB@ - name of lint library file to make -+# MAKE_LINT_LIB - automake conditional - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 - --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --am__doit: -- @echo this is the am__doit target --.PHONY: am__doit --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include="#" --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# Ignore all kinds of additional output from `make'. --case `$am_make -s -f confmf 2> /dev/null` in #( --*the\ am__doit\ target*) -- am__include=include -- am__quote= -- _am_result=GNU -- ;; --esac --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- case `$am_make -s -f confmf 2> /dev/null` in #( -- *the\ am__doit\ target*) -- am__include=.include -- am__quote="\"" -- _am_result=BSD -- ;; -- esac -+AC_DEFUN([XORG_LINT_LIBRARY],[ -+AC_REQUIRE([XORG_WITH_LINT]) -+# Build lint "library" for more indepth checks of programs calling this library -+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], -+ [Create lint library (default: disabled)])], -+ [make_lint_lib=$enableval], [make_lint_lib=no]) -+if test "x$make_lint_lib" != "xno" ; then -+ if test "x$LINT" = "xno" ; then -+ AC_MSG_ERROR([Cannot make lint library without --with-lint]) -+ fi -+ if test "x$make_lint_lib" = "xyes" ; then -+ LINTLIB=llib-l$1.ln -+ else -+ LINTLIB=$make_lint_lib -+ fi - fi --AC_SUBST([am__include]) --AC_SUBST([am__quote]) --AC_MSG_RESULT([$_am_result]) --rm -f confinc confmf --]) -+AC_SUBST(LINTLIB) -+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) - --# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+]) # XORG_LINT_LIBRARY - --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. -+# XORG_CWARNFLAGS -+# --------------- -+# Minimum version: 1.2.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 6 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -+# Defines CWARNFLAGS to enable C compiler warnings. -+# -+AC_DEFUN([XORG_CWARNFLAGS], [ -+AC_REQUIRE([AC_PROG_CC]) -+if test "x$GCC" = xyes ; then -+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ -+-Wbad-function-cast" -+ case `$CC -dumpversion` in -+ 3.4.* | 4.*) -+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" -+ ;; -+ esac -+else -+ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) -+ if test "x$SUNCC" = "xyes"; then -+ CWARNFLAGS="-v" -+ fi -+fi -+AC_SUBST(CWARNFLAGS) -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -+]) # XORG_CWARNFLAGS - -+# XORG_STRICT_OPTION -+# ----------------------- -+# Minimum version: 1.3.0 -+# -+# Add configure option to enable strict compilation -+AC_DEFUN([XORG_STRICT_OPTION], [ -+AC_REQUIRE([AC_PROG_CC]) -+AC_REQUIRE([AC_PROG_CC_C99]) -+AC_REQUIRE([XORG_CWARNFLAGS]) - --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --AC_REQUIRE_AUX_FILE([missing])dnl --if test x"${MISSING+set}" != xset; then -- case $am_aux_dir in -- *\ * | *\ *) -- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; -- *) -- MISSING="\${SHELL} $am_aux_dir/missing" ;; -- esac --fi --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) -+AC_ARG_ENABLE(strict-compilation, -+ AS_HELP_STRING([--enable-strict-compilation], -+ [Enable all warnings from compiler and make them errors (default: disabled)]), -+ [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) -+if test "x$STRICT_COMPILE" = "xyes"; then -+ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) -+ AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) -+ if test "x$GCC" = xyes ; then -+ STRICT_CFLAGS="-pedantic -Werror" -+ elif test "x$SUNCC" = "xyes"; then -+ STRICT_CFLAGS="-errwarn" -+ elif test "x$INTELCC" = "xyes"; then -+ STRICT_CFLAGS="-Werror" -+ fi - fi --]) -+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" -+AC_SUBST([CWARNFLAGS]) -+]) # XORG_STRICT_OPTION - --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# XORG_DEFAULT_OPTIONS -+# -------------------- -+# Minimum version: 1.3.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Defines default options for X.Org modules. -+# -+AC_DEFUN([XORG_DEFAULT_OPTIONS], [ -+XORG_CWARNFLAGS -+XORG_STRICT_OPTION -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_MANPAGE_SECTIONS -+]) # XORG_DEFAULT_OPTIONS -+dnl Copyright 2005 Red Hat, Inc -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation. -+dnl -+dnl The above copyright notice and this permission notice shall be included -+dnl in all copies or substantial portions of the Software. -+dnl -+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+dnl OTHER DEALINGS IN THE SOFTWARE. -+dnl -+dnl Except as contained in this notice, the name of the copyright holders shall -+dnl not be used in advertising or otherwise to promote the sale, use or -+dnl other dealings in this Software without prior written authorization -+dnl from the copyright holders. -+dnl - --# AM_PROG_MKDIR_P --# --------------- --# Check for `mkdir -p'. --AC_DEFUN([AM_PROG_MKDIR_P], --[AC_PREREQ([2.60])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, --dnl while keeping a definition of mkdir_p for backward compatibility. --dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. --dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of --dnl Makefile.ins that do not define MKDIR_P, so we do our own --dnl adjustment using top_builddir (which is defined more often than --dnl MKDIR_P). --AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl --case $mkdir_p in -- [[\\/$]]* | ?:[[\\/]]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac -+# XORG_RELEASE_VERSION -+# -------------------- -+# Adds --with/without-release-string and changes the PACKAGE and -+# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also -+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. -+ -+AC_DEFUN([XORG_RELEASE_VERSION],[ -+ AC_ARG_WITH(release-version, -+ AS_HELP_STRING([--with-release-version=STRING], -+ [Use release version string in package name]), -+ [RELEASE_VERSION="$withval"], -+ [RELEASE_VERSION=""]) -+ if test "x$RELEASE_VERSION" != "x"; then -+ PACKAGE="$PACKAGE-$RELEASE_VERSION" -+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -+ AC_MSG_NOTICE([Building with package name set to $PACKAGE]) -+ fi -+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], -+ [`echo $PACKAGE_VERSION | cut -d . -f 1`], -+ [Major version of this package]) -+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` -+ if test "x$PVM" = "x"; then -+ PVM="0" -+ fi -+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], -+ [$PVM], -+ [Minor version of this package]) -+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` -+ if test "x$PVP" = "x"; then -+ PVP="0" -+ fi -+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], -+ [$PVP], -+ [Patch version of this package]) - ]) - --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -+# XORG_CHANGELOG() -+# ---------------- -+# Minimum version: 1.2.0 - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 4 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+# Defines the variable CHANGELOG_CMD as the command to generate -+# ChangeLog from git. -+# -+# Arrange that distcleancheck ignores ChangeLog left over by distclean. -+# -+AC_DEFUN([XORG_CHANGELOG], [ -+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ -+echo 'git directory not found: installing possibly empty changelog.' >&2)" -+AC_SUBST([CHANGELOG_CMD]) -+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) -+]) # XORG_CHANGELOG - --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ -+dnl -+dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation. -+dnl -+dnl The above copyright notice and this permission notice shall be included -+dnl in all copies or substantial portions of the Software. -+dnl -+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+dnl OTHER DEALINGS IN THE SOFTWARE. -+dnl -+dnl Except as contained in this notice, the name of the copyright holders shall -+dnl not be used in advertising or otherwise to promote the sale, use or -+dnl other dealings in this Software without prior written authorization -+dnl from the copyright holders. -+dnl - --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+# XTRANS_TCP_FLAGS() -+# ------------------ -+# Find needed libraries for TCP sockets, and check for IPv6 support -+AC_DEFUN([XTRANS_TCP_FLAGS],[ -+ # SVR4 hides these in libraries other than libc -+ AC_SEARCH_LIBS(socket, [socket]) -+ AC_SEARCH_LIBS(gethostbyname, [nsl]) - --# Check to make sure that the build environment is sane. -*- Autoconf -*- -+ # Needs to come after above checks for libsocket & libnsl for SVR4 systems -+ AC_ARG_ENABLE(ipv6, -+ AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]), -+ [IPV6CONN=$enableval], -+ [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) -+ AC_MSG_CHECKING([if IPv6 support should be built]) -+ if test "$IPV6CONN" = "yes"; then -+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) -+ fi -+ AC_MSG_RESULT($IPV6CONN) - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ # 4.3BSD-Reno added a new member to struct sockaddr_in -+ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], -+ AC_DEFINE([BSD44SOCKETS],1, -+ [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ -+#include -+#include -+#include -+ ]) - --# serial 5 -+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. -+ AC_CHECK_TYPES([socklen_t], [], [], [ -+AC_INCLUDES_DEFAULT -+#include ]) -+ -+]) # XTRANS_TCP_FLAGS - --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Reject unsafe characters in $srcdir or the absolute working directory --# name. Accept space and tab only in the latter. --am_lf=' --' --case `pwd` in -- *[[\\\"\#\$\&\'\`$am_lf]]*) -- AC_MSG_ERROR([unsafe absolute working directory name]);; --esac --case $srcdir in -- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) -- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; --esac -+# XTRANS_CONNECTION_FLAGS() -+# ------------------------- -+# Standard checks for which Xtrans transports to use by the Xorg packages -+# that use Xtrans functions -+AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_REQUIRE([AC_TYPE_SIGNAL]) -+ [case $host_os in -+ mingw*) unixdef="no" ;; -+ *) unixdef="yes" ;; -+ esac] -+ AC_ARG_ENABLE(unix-transport, -+ AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), -+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef]) -+ AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) -+ if test "$UNIXCONN" = "yes"; then -+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) -+ fi -+ AC_MSG_RESULT($UNIXCONN) -+ AC_ARG_ENABLE(tcp-transport, -+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), -+ [TCPCONN=$enableval], [TCPCONN=yes]) -+ AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) -+ AC_MSG_RESULT($TCPCONN) -+ if test "$TCPCONN" = "yes"; then -+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) -+ XTRANS_TCP_FLAGS -+ fi -+ [case $host_os in -+ solaris*|sco*|sysv4*) localdef="yes" ;; -+ *) localdef="no" ;; -+ esac] -+ AC_ARG_ENABLE(local-transport, -+ AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]), -+ [LOCALCONN=$enableval], [LOCALCONN=$localdef]) -+ AC_MSG_CHECKING([if Xtrans should support os-specific local connections]) -+ AC_MSG_RESULT($LOCALCONN) -+ if test "$LOCALCONN" = "yes"; then -+ AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) -+ fi -+ -+]) # XTRANS_CONNECTION_FLAGS - --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t "$srcdir/configure" conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -+# XTRANS_SECURE_RPC_FLAGS() -+# ------------------------- -+# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS -+# so that any necessary networking libraries are already found -+AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], -+[AC_REQUIRE([XTRANS_TCP_FLAGS]) -+ AC_ARG_ENABLE(secure-rpc, -+ AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), -+ [SECURE_RPC=$enableval], [SECURE_RPC="try"]) - -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --AC_MSG_RESULT(yes)]) -+ if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then -+ FOUND_SECURE_RPC="no" -+ AC_CHECK_FUNCS([authdes_seccreate authdes_create], -+ [FOUND_SECURE_RPC="yes"]) -+ if test "x$FOUND_SECURE_RPC" = "xno" ; then -+ if test "x$SECURE_RPC" = "xyes" ; then -+ AC_MSG_ERROR([Secure RPC requested, but required functions not found]) -+ fi -+ SECURE_RPC="no" -+ else -+ dnl FreeBSD keeps getsecretkey in librpcsvc -+ AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) -+ SECURE_RPC="yes" -+ fi -+ fi -+ AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) -+ if test "x$SECURE_RPC" = "xyes" ; then -+ AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) -+ fi -+ AC_MSG_RESULT($SECURE_RPC) -+]) # XTRANS_SECURE_RPC_FLAGS - --# Copyright (C) 2009 Free Software Foundation, Inc. -+ -+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -- --# AM_SILENT_RULES([DEFAULT]) --# -------------------------- --# Enable less verbose build rules; with the default set to DEFAULT --# (`yes' being less verbose, `no' or empty being verbose). --AC_DEFUN([AM_SILENT_RULES], --[AC_ARG_ENABLE([silent-rules], --[ --enable-silent-rules less verbose build output (undo: `make V=1') -- --disable-silent-rules verbose build output (undo: `make V=0')]) --case $enable_silent_rules in --yes) AM_DEFAULT_VERBOSITY=0;; --no) AM_DEFAULT_VERBOSITY=1;; --*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; --esac --AC_SUBST([AM_DEFAULT_VERBOSITY])dnl --AM_BACKSLASH='\' --AC_SUBST([AM_BACKSLASH])dnl --_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.11' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.11], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) - --# AM_PROG_INSTALL_STRIP --# --------------------- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) --fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.11])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - --# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -+# Figure out how to run the assembler. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -- --# _AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- --# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. --# This macro is traced by Automake. --AC_DEFUN([_AM_SUBST_NOTMAKE]) -+# serial 5 - --# AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- --# Public sister of _AM_SUBST_NOTMAKE. --AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -+# AM_PROG_AS -+# ---------- -+AC_DEFUN([AM_PROG_AS], -+[# By default we simply use the C compiler to build assembly code. -+AC_REQUIRE([AC_PROG_CC]) -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) -+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) -+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl -+]) - --# Check how to create a tarball. -*- Autoconf -*- -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -- --# _AM_PROG_TAR(FORMAT) --# -------------------- --# Check how to create a tarball in format FORMAT. --# FORMAT should be one of `v7', `ustar', or `pax'. -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. - # --# Substitute a variable $(am__tar) that is a command --# writing to stdout a FORMAT-tarball containing the directory --# $tardir. --# tardir=directory && $(am__tar) > result.tar -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. - # --# Substitute a variable $(am__untar) that extract such --# a tarball read from stdin. --# $(am__untar) < result.tar --AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) --m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -- [m4_case([$1], [ustar],, [pax],, -- [m4_fatal([Unknown tar format])]) --AC_MSG_CHECKING([how to create a $1 tar archive]) --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' --_am_tools=${am_cv_prog_tar_$1-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -- -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -- -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -- rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir -- --AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) --AC_MSG_RESULT([$am_cv_prog_tar_$1])]) --AC_SUBST([am__tar]) --AC_SUBST([am__untar]) --]) # _AM_PROG_TAR -- --m4_include([m4/ac_define_dir.m4]) --m4_include([m4/dolt.m4]) --m4_include([m4/libtool.m4]) --m4_include([m4/ltoptions.m4]) --m4_include([m4/ltsugar.m4]) --m4_include([m4/ltversion.m4]) --m4_include([m4/lt~obsolete.m4]) --dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. --dnl --dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. --dnl --dnl Permission is hereby granted, free of charge, to any person obtaining a --dnl copy of this software and associated documentation files (the --dnl "Software"), to deal in the Software without restriction, including --dnl without limitation the rights to use, copy, modify, merge, publish, --dnl distribute, and/or sell copies of the Software, and to permit persons --dnl to whom the Software is furnished to do so, provided that the above --dnl copyright notice(s) and this permission notice appear in all copies of --dnl the Software and that both the above copyright notice(s) and this --dnl permission notice appear in supporting documentation. --dnl --dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT --dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR --dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL --dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING --dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, --dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION --dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --dnl --dnl Except as contained in this notice, the name of a copyright holder --dnl shall not be used in advertising or otherwise to promote the sale, use --dnl or other dealings in this Software without prior written authorization --dnl of the copyright holder. -- --# XORG_MACROS_VERSION(required-version) --# ------------------------------------- --# Minimum version: 1.1.0 --# --# If you're using a macro added in Version 1.1 or newer, include this in --# your configure.ac with the minimum required version, such as: --# XORG_MACROS_VERSION(1.1) -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir - # --# To ensure that this macro is defined, also add: --# m4_ifndef([XORG_MACROS_VERSION], --# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. - # -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. - # --# See the "minimum version" comment for each macro you use to see what --# version you require. --m4_defun([XORG_MACROS_VERSION],[ --m4_define([vers_have], [1.3.0]) --m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) --m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) --m4_if(m4_cmp(maj_have, maj_needed), 0,, -- [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) --m4_if(m4_version_compare(vers_have, [$1]), -1, -- [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) --m4_undefine([vers_have]) --m4_undefine([maj_have]) --m4_undefine([maj_needed]) --]) # XORG_MACROS_VERSION -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. - --# XORG_PROG_RAWCPP() --# ------------------ --# Minimum version: 1.0.0 -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) -+ -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -+# Free Software Foundation, Inc. - # --# Find cpp program and necessary flags for use in pre-processing text files --# such as man pages and config files --AC_DEFUN([XORG_PROG_RAWCPP],[ --AC_REQUIRE([AC_PROG_CPP]) --AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], -- [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# Check for flag to avoid builtin definitions - assumes unix is predefined, --# which is not the best choice for supporting other OS'es, but covers most --# of the ones we need for now. --AC_MSG_CHECKING([if $RAWCPP requires -undef]) --AC_LANG_CONFTEST([Does cpp redefine unix ?]) --if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- AC_MSG_RESULT([no]) --else -- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- RAWCPPFLAGS=-undef -- AC_MSG_RESULT([yes]) -- # under Cygwin unix is still defined even with -undef -- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then -- RAWCPPFLAGS="-undef -ansi" -- AC_MSG_RESULT([yes, with -ansi]) -- else -- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) -- fi --fi --rm -f conftest.$ac_ext -+# serial 9 - --AC_MSG_CHECKING([if $RAWCPP requires -traditional]) --AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) --if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -- AC_MSG_RESULT([no]) -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+m4_define([_AM_COND_VALUE_$1], [$2])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' - else -- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then -- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) -- fi -+ $1_TRUE='#' -+ $1_FALSE= - fi --rm -f conftest.$ac_ext --AC_SUBST(RAWCPPFLAGS) --]) # XORG_PROG_RAWCPP -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) - --# XORG_MANPAGE_SECTIONS() --# ----------------------- --# Minimum version: 1.0.0 -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -+# Free Software Foundation, Inc. - # --# Determine which sections man pages go in for the different man page types --# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. --# Not sure if there's any better way than just hardcoding by OS name. --# Override default settings by setting environment variables -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --AC_DEFUN([XORG_MANPAGE_SECTIONS],[ --AC_REQUIRE([AC_CANONICAL_HOST]) -+# serial 10 - --if test x$APP_MAN_SUFFIX = x ; then -- APP_MAN_SUFFIX=1 --fi --if test x$APP_MAN_DIR = x ; then -- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' --fi -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - --if test x$LIB_MAN_SUFFIX = x ; then -- LIB_MAN_SUFFIX=3 --fi --if test x$LIB_MAN_DIR = x ; then -- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' --fi -- --if test x$FILE_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) FILE_MAN_SUFFIX=4 ;; -- *) FILE_MAN_SUFFIX=5 ;; -- esac --fi --if test x$FILE_MAN_DIR = x ; then -- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' --fi -- --if test x$MISC_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) MISC_MAN_SUFFIX=5 ;; -- *) MISC_MAN_SUFFIX=7 ;; -- esac --fi --if test x$MISC_MAN_DIR = x ; then -- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' --fi -- --if test x$DRIVER_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) DRIVER_MAN_SUFFIX=7 ;; -- *) DRIVER_MAN_SUFFIX=4 ;; -- esac --fi --if test x$DRIVER_MAN_DIR = x ; then -- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' --fi -- --if test x$ADMIN_MAN_SUFFIX = x ; then -- case $host_os in -- solaris*) ADMIN_MAN_SUFFIX=1m ;; -- *) ADMIN_MAN_SUFFIX=8 ;; -- esac --fi --if test x$ADMIN_MAN_DIR = x ; then -- ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' --fi - -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl - --AC_SUBST([APP_MAN_SUFFIX]) --AC_SUBST([LIB_MAN_SUFFIX]) --AC_SUBST([FILE_MAN_SUFFIX]) --AC_SUBST([MISC_MAN_SUFFIX]) --AC_SUBST([DRIVER_MAN_SUFFIX]) --AC_SUBST([ADMIN_MAN_SUFFIX]) --AC_SUBST([APP_MAN_DIR]) --AC_SUBST([LIB_MAN_DIR]) --AC_SUBST([FILE_MAN_DIR]) --AC_SUBST([MISC_MAN_DIR]) --AC_SUBST([DRIVER_MAN_DIR]) --AC_SUBST([ADMIN_MAN_DIR]) --]) # XORG_MANPAGE_SECTIONS -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) - --# XORG_CHECK_LINUXDOC --# ------------------- --# Minimum version: 1.0.0 --# --# Defines the variable MAKE_TEXT if the necessary tools and --# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. --# Whether or not the necessary tools and files are found can be checked --# with the AM_CONDITIONAL "BUILD_LINUXDOC" --AC_DEFUN([XORG_CHECK_LINUXDOC],[ --if test x$XORG_SGML_PATH = x ; then -- XORG_SGML_PATH=$prefix/share/sgml --fi --HAVE_DEFS_ENT= -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - --if test x"$cross_compiling" = x"yes" ; then -- HAVE_DEFS_ENT=no --else -- AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) --fi -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ am__universal=false -+ m4_case([$1], [CC], -+ [case " $depcc " in #( -+ *\ -arch\ *\ -arch\ *) am__universal=true ;; -+ esac], -+ [CXX], -+ [case " $depcc " in #( -+ *\ -arch\ *\ -arch\ *) am__universal=true ;; -+ esac]) - --AC_PATH_PROG(LINUXDOC, linuxdoc) --AC_PATH_PROG(PS2PDF, ps2pdf) -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - --AC_MSG_CHECKING([Whether to build documentation]) -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs -+ am__obj=sub/conftest.${OBJEXT-o} -+ am__minus_obj="-o $am__obj" -+ case $depmode in -+ gcc) -+ # This depmode causes a compiler race in universal mode. -+ test "$am__universal" = false || continue -+ ;; -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ msvisualcpp | msvcmsys) -+ # This compiler won't grok `-c -o', but also, the minuso test has -+ # not run yet. These depmodes are late enough in the game, and -+ # so weak that their functioning should not be impacted. -+ am__obj=conftest.${OBJEXT-o} -+ am__minus_obj= -+ ;; -+ none) break ;; -+ esac -+ if depmode=$depmode \ -+ source=sub/conftest.c object=$am__obj \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - --if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then -- BUILDDOC=yes -+ cd .. -+ rm -rf conftest.dir - else -- BUILDDOC=no -+ am_cv_$1_dependencies_compiler_type=none - fi -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -+]) - --AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) - --AC_MSG_RESULT([$BUILDDOC]) -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) - --AC_MSG_CHECKING([Whether to build pdf documentation]) - --if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then -- BUILDPDFDOC=yes --else -- BUILDPDFDOC=no -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' - fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+]) - --AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) -+# Generate code to set up dependency tracking. -*- Autoconf -*- - --AC_MSG_RESULT([$BUILDPDFDOC]) -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" --MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" --MAKE_PDF="$PS2PDF" --MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" -+#serial 5 - --AC_SUBST(MAKE_TEXT) --AC_SUBST(MAKE_PS) --AC_SUBST(MAKE_PDF) --AC_SUBST(MAKE_HTML) --]) # XORG_CHECK_LINUXDOC -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[{ -+ # Autoconf 2.62 quotes --file arguments for eval, but not when files -+ # are listed without --file. Let's play safe and only enable the eval -+ # if we detect the quoting. -+ case $CONFIG_FILES in -+ *\'*) eval set x "$CONFIG_FILES" ;; -+ *) set x $CONFIG_FILES ;; -+ esac -+ shift -+ for mf -+ do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+ done -+} -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS - --# XORG_CHECK_DOCBOOK --# ------------------- --# Minimum version: 1.0.0 -+ -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. - # --# Checks for the ability to build output formats from SGML DocBook source. --# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" --# indicates whether the necessary tools and files are found and, if set, --# $(MAKE_XXX) blah.sgml will produce blah.xxx. --AC_DEFUN([XORG_CHECK_DOCBOOK],[ --if test x$XORG_SGML_PATH = x ; then -- XORG_SGML_PATH=$prefix/share/sgml --fi --HAVE_DEFS_ENT= --BUILDTXTDOC=no --BUILDPDFDOC=no --BUILDPSDOC=no --BUILDHTMLDOC=no -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) - --AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -+# Do all the work for Automake. -*- Autoconf -*- - --AC_PATH_PROG(DOCBOOKPS, docbook2ps) --AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) --AC_PATH_PROG(DOCBOOKHTML, docbook2html) --AC_PATH_PROG(DOCBOOKTXT, docbook2txt) -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --AC_MSG_CHECKING([Whether to build text documentation]) --if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && -- test x$BUILD_TXTDOC != xno; then -- BUILDTXTDOC=yes --fi --AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) --AC_MSG_RESULT([$BUILDTXTDOC]) -+# serial 16 - --AC_MSG_CHECKING([Whether to build PDF documentation]) --if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && -- test x$BUILD_PDFDOC != xno; then -- BUILDPDFDOC=yes --fi --AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) --AC_MSG_RESULT([$BUILDPDFDOC]) -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. - --AC_MSG_CHECKING([Whether to build PostScript documentation]) --if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && -- test x$BUILD_PSDOC != xno; then -- BUILDPSDOC=yes -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.62])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi - fi --AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) --AC_MSG_RESULT([$BUILDPSDOC]) - --AC_MSG_CHECKING([Whether to build HTML documentation]) --if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && -- test x$BUILD_HTMLDOC != xno; then -- BUILDHTMLDOC=yes -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi - fi --AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) --AC_MSG_RESULT([$BUILDHTMLDOC]) -- --MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" --MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" --MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" --MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" -+AC_SUBST([CYGPATH_W]) - --AC_SUBST(MAKE_TEXT) --AC_SUBST(MAKE_PS) --AC_SUBST(MAKE_PDF) --AC_SUBST(MAKE_HTML) --]) # XORG_CHECK_DOCBOOK -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - --# XORG_CHECK_MALLOC_ZERO --# ---------------------- --# Minimum version: 1.0.0 --# --# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if --# malloc(0) returns NULL. Packages should add one of these cflags to --# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. --AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ --AC_ARG_ENABLE(malloc0returnsnull, -- AS_HELP_STRING([--enable-malloc0returnsnull], -- [malloc(0) returns NULL (default: auto)]), -- [MALLOC_ZERO_RETURNS_NULL=$enableval], -- [MALLOC_ZERO_RETURNS_NULL=auto]) -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - --AC_MSG_CHECKING([whether malloc(0) returns NULL]) --if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then -- AC_RUN_IFELSE([ --char *malloc(); --char *realloc(); --char *calloc(); --main() { -- char *m0, *r0, *c0, *p; -- m0 = malloc(0); -- p = malloc(10); -- r0 = realloc(p,0); -- c0 = calloc(0); -- exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); --}], -- [MALLOC_ZERO_RETURNS_NULL=yes], -- [MALLOC_ZERO_RETURNS_NULL=no]) --fi --AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+]) -+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -+AC_CONFIG_COMMANDS_PRE(dnl -+[m4_provide_if([_AM_COMPILER_EXEEXT], -+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -+]) - --if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then -- MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" -- XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS -- XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" --else -- MALLOC_ZERO_CFLAGS="" -- XMALLOC_ZERO_CFLAGS="" -- XTMALLOC_ZERO_CFLAGS="" --fi -+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -+dnl mangled by Autoconf and run in a shell conditional statement. -+m4_define([_AC_COMPILER_EXEEXT], -+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - --AC_SUBST([MALLOC_ZERO_CFLAGS]) --AC_SUBST([XMALLOC_ZERO_CFLAGS]) --AC_SUBST([XTMALLOC_ZERO_CFLAGS]) --]) # XORG_CHECK_MALLOC_ZERO - --# XORG_WITH_LINT() --# ---------------- --# Minimum version: 1.1.0 -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_arg=$1 -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $_am_arg | $_am_arg:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. - # --# Sets up flags for source checkers such as lint and sparse if --with-lint --# is specified. (Use --with-lint=sparse for sparse.) --# Sets $LINT to name of source checker passed with --with-lint (default: lint) --# Sets $LINT_FLAGS to flags to pass to source checker --# Sets LINT automake conditional if enabled (default: disabled) -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+if test x"${install_sh}" != xset; then -+ case $am_aux_dir in -+ *\ * | *\ *) -+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; -+ *) -+ install_sh="\${SHELL} $am_aux_dir/install-sh" -+ esac -+fi -+AC_SUBST(install_sh)]) -+ -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. - # --AC_DEFUN([XORG_WITH_LINT],[ -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# Allow checking code with lint, sparse, etc. --AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], -- [Use a lint-style source code checker (default: disabled)])], -- [use_lint=$withval], [use_lint=no]) --if test "x$use_lint" = "xyes" ; then -- LINT="lint" -+# serial 2 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. - else -- LINT="$use_lint" --fi --if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then -- case $LINT in -- lint|*/lint) -- case $host_os in -- solaris*) -- LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" -- ;; -- esac -- ;; -- esac -+ am__leading_dot=_ - fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) - --AC_SUBST(LINT) --AC_SUBST(LINT_FLAGS) --AM_CONDITIONAL(LINT, [test x$LINT != xno]) -- --]) # XORG_WITH_LINT -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering - --# XORG_LINT_LIBRARY(LIBNAME) --# -------------------------- --# Minimum version: 1.1.0 --# --# Sets up flags for building lint libraries for checking programs that call --# functions in the library. --# Disabled by default, enable with --enable-lint-library --# Sets: --# @LINTLIB@ - name of lint library file to make --# MAKE_LINT_LIB - automake conditional -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. - # -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --AC_DEFUN([XORG_LINT_LIBRARY],[ --AC_REQUIRE([XORG_WITH_LINT]) --# Build lint "library" for more indepth checks of programs calling this library --AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], -- [Create lint library (default: disabled)])], -- [make_lint_lib=$enableval], [make_lint_lib=no]) --if test "x$make_lint_lib" != "xno" ; then -- if test "x$LINT" = "xno" ; then -- AC_MSG_ERROR([Cannot make lint library without --with-lint]) -- fi -- if test "x$make_lint_lib" = "xyes" ; then -- LINTLIB=llib-l$1.ln -- else -- LINTLIB=$make_lint_lib -- fi --fi --AC_SUBST(LINTLIB) --AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) -+# serial 5 - --]) # XORG_LINT_LIBRARY -+# AM_MAINTAINER_MODE([DEFAULT-MODE]) -+# ---------------------------------- -+# Control maintainer-specific portions of Makefiles. -+# Default is to disable them, unless `enable' is passed literally. -+# For symmetry, `disable' may be passed as well. Anyway, the user -+# can override the default with the --enable/--disable switch. -+AC_DEFUN([AM_MAINTAINER_MODE], -+[m4_case(m4_default([$1], [disable]), -+ [enable], [m4_define([am_maintainer_other], [disable])], -+ [disable], [m4_define([am_maintainer_other], [enable])], -+ [m4_define([am_maintainer_other], [enable]) -+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed -+ AC_ARG_ENABLE([maintainer-mode], -+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ [USE_MAINTAINER_MODE=$enableval], -+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST([MAINT])dnl -+] -+) - --# XORG_CWARNFLAGS --# --------------- --# Minimum version: 1.2.0 --# --# Defines CWARNFLAGS to enable C compiler warnings. --# --AC_DEFUN([XORG_CWARNFLAGS], [ --AC_REQUIRE([AC_PROG_CC]) --if test "x$GCC" = xyes ; then -- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ ---Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ ---Wbad-function-cast" -- case `$CC -dumpversion` in -- 3.4.* | 4.*) -- CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" -- ;; -- esac --else -- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) -- if test "x$SUNCC" = "xyes"; then -- CWARNFLAGS="-v" -- fi --fi --AC_SUBST(CWARNFLAGS) --m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --]) # XORG_CWARNFLAGS -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - --# XORG_STRICT_OPTION --# ----------------------- --# Minimum version: 1.3.0 -+# Check to see how 'make' treats includes. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. - # --# Add configure option to enable strict compilation --AC_DEFUN([XORG_STRICT_OPTION], [ --AC_REQUIRE([AC_PROG_CC]) --AC_REQUIRE([AC_PROG_CC_C99]) --AC_REQUIRE([XORG_CWARNFLAGS]) -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --AC_ARG_ENABLE(strict-compilation, -- AS_HELP_STRING([--enable-strict-compilation], -- [Enable all warnings from compiler and make them errors (default: disabled)]), -- [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) --if test "x$STRICT_COMPILE" = "xyes"; then -- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) -- AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) -- if test "x$GCC" = xyes ; then -- STRICT_CFLAGS="-pedantic -Werror" -- elif test "x$SUNCC" = "xyes"; then -- STRICT_CFLAGS="-errwarn" -- elif test "x$INTELCC" = "xyes"; then -- STRICT_CFLAGS="-Werror" -- fi --fi --CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" --AC_SUBST([CWARNFLAGS]) --]) # XORG_STRICT_OPTION -+# serial 4 - --# XORG_DEFAULT_OPTIONS --# -------------------- --# Minimum version: 1.3.0 --# --# Defines default options for X.Org modules. --# --AC_DEFUN([XORG_DEFAULT_OPTIONS], [ --XORG_CWARNFLAGS --XORG_STRICT_OPTION --XORG_RELEASE_VERSION --XORG_CHANGELOG --XORG_MANPAGE_SECTIONS --]) # XORG_DEFAULT_OPTIONS --dnl Copyright 2005 Red Hat, Inc --dnl --dnl Permission to use, copy, modify, distribute, and sell this software and its --dnl documentation for any purpose is hereby granted without fee, provided that --dnl the above copyright notice appear in all copies and that both that --dnl copyright notice and this permission notice appear in supporting --dnl documentation. --dnl --dnl The above copyright notice and this permission notice shall be included --dnl in all copies or substantial portions of the Software. --dnl --dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --dnl OTHER DEALINGS IN THE SOFTWARE. --dnl --dnl Except as contained in this notice, the name of the copyright holders shall --dnl not be used in advertising or otherwise to promote the sale, use or --dnl other dealings in this Software without prior written authorization --dnl from the copyright holders. --dnl -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo this is the am__doit target -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# Ignore all kinds of additional output from `make'. -+case `$am_make -s -f confmf 2> /dev/null` in #( -+*the\ am__doit\ target*) -+ am__include=include -+ am__quote= -+ _am_result=GNU -+ ;; -+esac -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ case `$am_make -s -f confmf 2> /dev/null` in #( -+ *the\ am__doit\ target*) -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ ;; -+ esac -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) - --# XORG_RELEASE_VERSION --# -------------------- --# Adds --with/without-release-string and changes the PACKAGE and --# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If --# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also --# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. -- --AC_DEFUN([XORG_RELEASE_VERSION],[ -- AC_ARG_WITH(release-version, -- AS_HELP_STRING([--with-release-version=STRING], -- [Use release version string in package name]), -- [RELEASE_VERSION="$withval"], -- [RELEASE_VERSION=""]) -- if test "x$RELEASE_VERSION" != "x"; then -- PACKAGE="$PACKAGE-$RELEASE_VERSION" -- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -- AC_MSG_NOTICE([Building with package name set to $PACKAGE]) -- fi -- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], -- [`echo $PACKAGE_VERSION | cut -d . -f 1`], -- [Major version of this package]) -- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` -- if test "x$PVM" = "x"; then -- PVM="0" -- fi -- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], -- [$PVM], -- [Minor version of this package]) -- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` -- if test "x$PVP" = "x"; then -- PVP="0" -- fi -- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], -- [$PVP], -- [Patch version of this package]) -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+ -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 6 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl -+if test x"${MISSING+set}" != xset; then -+ case $am_aux_dir in -+ *\ * | *\ *) -+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; -+ *) -+ MISSING="\${SHELL} $am_aux_dir/missing" ;; -+ esac -+fi -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) -+ -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac - ]) - --# XORG_CHANGELOG() --# ---------------- --# Minimum version: 1.2.0 --# --# Defines the variable CHANGELOG_CMD as the command to generate --# ChangeLog from git. --# --# Arrange that distcleancheck ignores ChangeLog left over by distclean. -+# Helper functions for option handling. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# Check to make sure that the build environment is sane. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 5 -+ -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Reject unsafe characters in $srcdir or the absolute working directory -+# name. Accept space and tab only in the latter. -+am_lf=' -+' -+case `pwd` in -+ *[[\\\"\#\$\&\'\`$am_lf]]*) -+ AC_MSG_ERROR([unsafe absolute working directory name]);; -+esac -+case $srcdir in -+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) -+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -+esac -+ -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t "$srcdir/configure" conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) -+ -+# Copyright (C) 2009 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 1 -+ -+# AM_SILENT_RULES([DEFAULT]) -+# -------------------------- -+# Enable less verbose build rules; with the default set to DEFAULT -+# (`yes' being less verbose, `no' or empty being verbose). -+AC_DEFUN([AM_SILENT_RULES], -+[AC_ARG_ENABLE([silent-rules], -+[ --enable-silent-rules less verbose build output (undo: `make V=1') -+ --disable-silent-rules verbose build output (undo: `make V=0')]) -+case $enable_silent_rules in -+yes) AM_DEFAULT_VERBOSITY=0;; -+no) AM_DEFAULT_VERBOSITY=1;; -+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -+esac -+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -+AM_BACKSLASH='\' -+AC_SUBST([AM_BACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -+]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+ -+# Copyright (C) 2006, 2008 Free Software Foundation, Inc. - # --AC_DEFUN([XORG_CHANGELOG], [ --CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ --mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ --echo 'git directory not found: installing possibly empty changelog.' >&2)" --AC_SUBST([CHANGELOG_CMD]) --AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) --]) # XORG_CHANGELOG -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ --dnl --dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. --dnl --dnl Permission to use, copy, modify, distribute, and sell this software and its --dnl documentation for any purpose is hereby granted without fee, provided that --dnl the above copyright notice appear in all copies and that both that --dnl copyright notice and this permission notice appear in supporting --dnl documentation. --dnl --dnl The above copyright notice and this permission notice shall be included --dnl in all copies or substantial portions of the Software. --dnl --dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --dnl OTHER DEALINGS IN THE SOFTWARE. --dnl --dnl Except as contained in this notice, the name of the copyright holders shall --dnl not be used in advertising or otherwise to promote the sale, use or --dnl other dealings in this Software without prior written authorization --dnl from the copyright holders. --dnl -+# serial 2 - --# XTRANS_TCP_FLAGS() --# ------------------ --# Find needed libraries for TCP sockets, and check for IPv6 support --AC_DEFUN([XTRANS_TCP_FLAGS],[ -- # SVR4 hides these in libraries other than libc -- AC_SEARCH_LIBS(socket, [socket]) -- AC_SEARCH_LIBS(gethostbyname, [nsl]) -- AC_HAVE_LIBRARY([ws2_32]) -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) - -- # Needs to come after above checks for libsocket & libnsl for SVR4 systems -- AC_ARG_ENABLE(ipv6, -- AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]), -- [IPV6CONN=$enableval], -- [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) -- AC_MSG_CHECKING([if IPv6 support should be built]) -- if test "$IPV6CONN" = "yes"; then -- AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) -- fi -- AC_MSG_RESULT($IPV6CONN) -+# AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Public sister of _AM_SUBST_NOTMAKE. -+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -- # 4.3BSD-Reno added a new member to struct sockaddr_in -- AC_CHECK_MEMBER([struct sockaddr_in.sin_len], -- AC_DEFINE([BSD44SOCKETS],1, -- [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ --#include --#include --#include -- ]) -+# Check how to create a tarball. -*- Autoconf -*- - -- # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. -- AC_CHECK_TYPES([socklen_t], [], [], [ --AC_INCLUDES_DEFAULT --#include ]) -- --]) # XTRANS_TCP_FLAGS -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# XTRANS_CONNECTION_FLAGS() --# ------------------------- --# Standard checks for which Xtrans transports to use by the Xorg packages --# that use Xtrans functions --AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ -- AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_REQUIRE([AC_TYPE_SIGNAL]) -- [case $host_os in -- mingw*) unixdef="no" ;; -- *) unixdef="yes" ;; -- esac] -- AC_ARG_ENABLE(unix-transport, -- AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), -- [UNIXCONN=$enableval], [UNIXCONN=$unixdef]) -- AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) -- if test "$UNIXCONN" = "yes"; then -- AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) -- fi -- AC_MSG_RESULT($UNIXCONN) -- AC_ARG_ENABLE(tcp-transport, -- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), -- [TCPCONN=$enableval], [TCPCONN=yes]) -- AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) -- AC_MSG_RESULT($TCPCONN) -- if test "$TCPCONN" = "yes"; then -- AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) -- XTRANS_TCP_FLAGS -- fi -- [case $host_os in -- solaris*|sco*|sysv4*) localdef="yes" ;; -- *) localdef="no" ;; -- esac] -- AC_ARG_ENABLE(local-transport, -- AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]), -- [LOCALCONN=$enableval], [LOCALCONN=$localdef]) -- AC_MSG_CHECKING([if Xtrans should support os-specific local connections]) -- AC_MSG_RESULT($LOCALCONN) -- if test "$LOCALCONN" = "yes"; then -- AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) -- fi -- --]) # XTRANS_CONNECTION_FLAGS -+# serial 2 - -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac - --# XTRANS_SECURE_RPC_FLAGS() --# ------------------------- --# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS --# so that any necessary networking libraries are already found --AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], --[AC_REQUIRE([XTRANS_TCP_FLAGS]) -- AC_ARG_ENABLE(secure-rpc, -- AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), -- [SECURE_RPC=$enableval], [SECURE_RPC="try"]) -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break - -- if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then -- FOUND_SECURE_RPC="no" -- AC_CHECK_FUNCS([authdes_seccreate authdes_create], -- [FOUND_SECURE_RPC="yes"]) -- if test "x$FOUND_SECURE_RPC" = "xno" ; then -- if test "x$SECURE_RPC" = "xyes" ; then -- AC_MSG_ERROR([Secure RPC requested, but required functions not found]) -- fi -- SECURE_RPC="no" -- else -- dnl FreeBSD keeps getsecretkey in librpcsvc -- AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) -- SECURE_RPC="yes" -- fi -- fi -- AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) -- if test "x$SECURE_RPC" = "xyes" ; then -- AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) -- fi -- AC_MSG_RESULT($SECURE_RPC) --]) # XTRANS_SECURE_RPC_FLAGS -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir - -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR - -+m4_include([m4/ac_define_dir.m4]) -+m4_include([m4/dolt.m4]) -+m4_include([m4/libtool.m4]) -+m4_include([m4/ltoptions.m4]) -+m4_include([m4/ltsugar.m4]) -+m4_include([m4/ltversion.m4]) -+m4_include([m4/lt~obsolete.m4]) -diff -Naur xorg-server-1.7.99.1/composite/Makefile.in xorg-server-1.7.99.1.patch/composite/Makefile.in ---- xorg-server-1.7.99.1/composite/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/composite/Makefile.in 2009-11-15 21:03:55.385356421 +0100 -@@ -257,7 +257,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -279,6 +278,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/config/config-backends.h xorg-server-1.7.99.1.patch/config/config-backends.h ---- xorg-server-1.7.99.1/config/config-backends.h 2008-11-14 22:27:05.000000000 +0100 -+++ xorg-server-1.7.99.1.patch/config/config-backends.h 2009-11-15 20:28:56.126390180 +0100 -@@ -27,7 +27,12 @@ - #include - #endif - --#ifdef CONFIG_NEED_DBUS -+#ifdef CONFIG_UDEV -+int config_udev_init(void); -+void config_udev_fini(void); -+#else -+ -+# ifdef CONFIG_NEED_DBUS - #include - - typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, -@@ -46,14 +51,15 @@ - void config_dbus_core_fini(void); - int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); - void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); --#endif -+# endif - --#ifdef CONFIG_DBUS_API -+# ifdef CONFIG_DBUS_API - int config_dbus_init(void); - void config_dbus_fini(void); --#endif -+# endif - --#ifdef CONFIG_HAL -+# ifdef CONFIG_HAL - int config_hal_init(void); - void config_hal_fini(void); -+# endif - #endif -diff -Naur xorg-server-1.7.99.1/config/config.c xorg-server-1.7.99.1.patch/config/config.c ---- xorg-server-1.7.99.1/config/config.c 2009-10-13 19:04:27.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/config/config.c 2009-11-15 20:28:56.127233670 +0100 -@@ -34,7 +34,10 @@ - void - config_init(void) - { --#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) -+#ifdef CONFIG_UDEV -+ if (!config_udev_init()) -+ ErrorF("[config] failed to initialise udev\n"); -+#elif defined(CONFIG_NEED_DBUS) - if (config_dbus_core_init()) { - # ifdef CONFIG_DBUS_API - if (!config_dbus_init()) -@@ -54,7 +57,9 @@ - void - config_fini(void) - { --#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) -+#if defined(CONFIG_UDEV) -+ config_udev_fini(); -+#elif defined(CONFIG_NEED_DBUS) - # ifdef CONFIG_HAL - config_hal_fini(); - # endif -diff -Naur xorg-server-1.7.99.1/config/Makefile.am xorg-server-1.7.99.1.patch/config/Makefile.am ---- xorg-server-1.7.99.1/config/Makefile.am 2009-10-13 19:04:27.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/config/Makefile.am 2009-11-15 20:28:56.128233748 +0100 -@@ -3,20 +3,32 @@ - noinst_LTLIBRARIES = libconfig.la - libconfig_la_SOURCES = config.c config-backends.h - -+if CONFIG_UDEV -+ -+AM_CFLAGS += @UDEV_CFLAGS@ -+libconfig_la_SOURCES += udev.c -+libconfig_la_LIBADD = @UDEV_LIBS@ -+ -+else -+ - if CONFIG_NEED_DBUS - AM_CFLAGS += @DBUS_CFLAGS@ - libconfig_la_SOURCES += dbus-core.c --endif -+libconfig_la_LIBADD = @DBUS_LIBS@ - - if CONFIG_DBUS_API - dbusconfigdir = $(sysconfdir)/dbus-1/system.d - dbusconfig_DATA = xorg-server.conf -- - libconfig_la_SOURCES += dbus.c - endif - - if CONFIG_HAL - libconfig_la_SOURCES += hal.c -+libconfig_la_LIBADD += @HAL_LIBS@ - endif - -+endif # CONFIG_NEED_DBUS -+ -+endif # !CONFIG_UDEV -+ - EXTRA_DIST = xorg-server.conf x11-input.fdi -diff -Naur xorg-server-1.7.99.1/config/Makefile.in xorg-server-1.7.99.1.patch/config/Makefile.in ---- xorg-server-1.7.99.1/config/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/config/Makefile.in 2009-11-15 21:03:55.553356076 +0100 -@@ -35,10 +35,13 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@CONFIG_NEED_DBUS_TRUE@am__append_1 = @DBUS_CFLAGS@ --@CONFIG_NEED_DBUS_TRUE@am__append_2 = dbus-core.c --@CONFIG_DBUS_API_TRUE@am__append_3 = dbus.c --@CONFIG_HAL_TRUE@am__append_4 = hal.c -+@CONFIG_UDEV_TRUE@am__append_1 = @UDEV_CFLAGS@ -+@CONFIG_UDEV_TRUE@am__append_2 = udev.c -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_3 = @DBUS_CFLAGS@ -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_4 = dbus-core.c -+@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_5 = dbus.c -+@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_6 = hal.c -+@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_7 = @HAL_LIBS@ - subdir = config - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -61,14 +64,18 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) --libconfig_la_LIBADD = --am__libconfig_la_SOURCES_DIST = config.c config-backends.h dbus-core.c \ -- dbus.c hal.c --@CONFIG_NEED_DBUS_TRUE@am__objects_1 = dbus-core.lo --@CONFIG_DBUS_API_TRUE@am__objects_2 = dbus.lo --@CONFIG_HAL_TRUE@am__objects_3 = hal.lo -+am__DEPENDENCIES_1 = -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -+@CONFIG_UDEV_TRUE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -+am__libconfig_la_SOURCES_DIST = config.c config-backends.h udev.c \ -+ dbus-core.c dbus.c hal.c -+@CONFIG_UDEV_TRUE@am__objects_1 = udev.lo -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_2 = \ -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ dbus-core.lo -+@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_3 = dbus.lo -+@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_4 = hal.lo - am_libconfig_la_OBJECTS = config.lo $(am__objects_1) $(am__objects_2) \ -- $(am__objects_3) -+ $(am__objects_3) $(am__objects_4) - libconfig_la_OBJECTS = $(am_libconfig_la_OBJECTS) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -@@ -264,7 +271,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -286,6 +292,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -@@ -409,12 +417,16 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) -+AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) $(am__append_3) - noinst_LTLIBRARIES = libconfig.la - libconfig_la_SOURCES = config.c config-backends.h $(am__append_2) \ -- $(am__append_3) $(am__append_4) --@CONFIG_DBUS_API_TRUE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d --@CONFIG_DBUS_API_TRUE@dbusconfig_DATA = xorg-server.conf -+ $(am__append_4) $(am__append_5) $(am__append_6) -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_LIBADD = \ -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ @DBUS_LIBS@ \ -+@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ $(am__append_7) -+@CONFIG_UDEV_TRUE@libconfig_la_LIBADD = @UDEV_LIBS@ $(am__append_7) -+@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d -+@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfig_DATA = xorg-server.conf - EXTRA_DIST = xorg-server.conf x11-input.fdi - all: all-am - -@@ -472,6 +484,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-core.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hal.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udev.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -diff -Naur xorg-server-1.7.99.1/config/udev.c xorg-server-1.7.99.1.patch/config/udev.c ---- xorg-server-1.7.99.1/config/udev.c 1970-01-01 01:00:00.000000000 +0100 -+++ xorg-server-1.7.99.1.patch/config/udev.c 2009-11-15 20:28:56.130232157 +0100 -@@ -0,0 +1,283 @@ -+/* -+ * Copyright © 2009 Julien Cristau -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Julien Cristau -+ */ -+ -+#ifdef HAVE_DIX_CONFIG_H -+#include -+#endif -+ -+#include -+ -+#include "input.h" -+#include "inputstr.h" -+#include "hotplug.h" -+#include "config-backends.h" -+#include "os.h" -+ -+#define UDEV_PROP_KEY "x11_options." -+#define UDEV_XKB_PROP_KEY "xkb." -+ -+static void -+add_option(InputOption **options, const char *key, const char *value) -+{ -+ if (!value || *value == '\0') -+ return; -+ -+ for (; *options; options = &(*options)->next) -+ ; -+ *options = xcalloc(sizeof(**options), 1); -+ if (!*options) /* Yeesh. */ -+ return; -+ (*options)->key = xstrdup(key); -+ (*options)->value = xstrdup(value); -+ (*options)->next = NULL; -+} -+ -+static void -+device_added(struct udev_device *udev_device) -+{ -+ const char *path = NULL, *driver = NULL, *name = NULL; -+ char *config_info = NULL; -+ const char *syspath; -+ const char *key, *value, *tmp; -+ InputOption *options = NULL, *tmpo; -+ DeviceIntPtr dev = NULL; -+ struct udev_list_entry *set, *entry; -+ struct udev_device *parent; -+ int rc; -+ -+ driver = udev_device_get_property_value(udev_device, "x11_driver"); -+ -+ path = udev_device_get_devnode(udev_device); -+ -+ syspath = udev_device_get_syspath(udev_device); -+ -+ parent = udev_device_get_parent(udev_device); -+ if (parent) -+ name = udev_device_get_property_value(parent, "NAME"); -+ -+ if (!driver) -+ return; -+ if (!path) -+ return; -+ if (!syspath) -+ return; -+ options = xcalloc(sizeof(*options), 1); -+ if (!options) -+ return; -+ -+ options->key = xstrdup("_source"); -+ options->value = xstrdup("server/udev"); -+ if (!options->key || !options->value) -+ goto unwind; -+ -+ add_option(&options, "path", path); -+ add_option(&options, "device", path); -+ add_option(&options, "driver", driver); -+ -+ config_info = xalloc(strlen(syspath) + 6); /* "udev:" + \0 */ -+ if (!config_info) -+ goto unwind; -+ sprintf(config_info, "udev:%s", syspath); -+ -+ set = udev_device_get_properties_list_entry(udev_device); -+ udev_list_entry_foreach(entry, set) { -+ key = udev_list_entry_get_name(entry); -+ if (!key) -+ continue; -+ if (!strncasecmp(key, UDEV_PROP_KEY, sizeof(UDEV_PROP_KEY) - 1)) { -+ value = udev_list_entry_get_value(entry); -+ add_option(&options, key + sizeof(UDEV_PROP_KEY) - 1, value); -+ } else if (!strncasecmp(key, UDEV_XKB_PROP_KEY, sizeof(UDEV_XKB_PROP_KEY) - 1)) { -+ tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1; -+ value = udev_list_entry_get_value(entry); -+ if (!strcasecmp(tmp, "rules")) -+ add_option(&options, "xkb_rules", value); -+ else if (!strcasecmp(tmp, "layout")) -+ add_option(&options, "xkb_layout", value); -+ else if (!strcasecmp(tmp, "variant")) -+ add_option(&options, "xkb_variant", value); -+ else if (!strcasecmp(tmp, "model")) -+ add_option(&options, "xkb_model", value); -+ else if (!strcasecmp(tmp, "options")) -+ add_option(&options, "xkb_options", value); -+ } -+ } -+ add_option(&options, "name", name ? name : "(unnamed)"); -+ LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n", -+ name, path); -+ rc = NewInputDeviceRequest(options, &dev); -+ if (rc != Success) -+ goto unwind; -+ -+ for (; dev; dev = dev->next) { -+ xfree(dev->config_info); -+ dev->config_info = xstrdup(config_info); -+ } -+ -+ unwind: -+ xfree(config_info); -+ while (!dev && (tmpo = options)) { -+ options = tmpo->next; -+ xfree(tmpo->key); -+ xfree(tmpo->value); -+ xfree(tmpo); -+ } -+ -+ return; -+} -+ -+static void -+remove_device(DeviceIntPtr dev) -+{ -+ LogMessage(X_INFO, "config/udev: Removing input device %s\n", dev->name); -+ OsBlockSignals(); -+ ProcessInputEvents(); -+ DeleteInputDeviceRequest(dev); -+ OsReleaseSignals(); -+} -+ -+static void -+device_removed(struct udev_device *device) -+{ -+ DeviceIntPtr dev, next; -+ char *value; -+ const char *syspath = udev_device_get_syspath(device); -+ -+ value = xalloc(strlen(syspath) + 6); /* "udev:" + \0 */ -+ if (!value) -+ return; -+ sprintf(value, "udev:%s", syspath); -+ -+ for (dev = inputInfo.devices; dev; dev = next) { -+ next = dev->next; -+ if (dev->config_info && !strcmp(dev->config_info, value)) -+ remove_device(dev); -+ } -+ for (dev = inputInfo.off_devices; dev; dev = next) { -+ next = dev->next; -+ if (dev->config_info && !strcmp(dev->config_info, value)) -+ remove_device(dev); -+ } -+ -+ xfree(value); -+} -+ -+static void -+wakeup_handler(pointer data, int err, pointer read_mask) -+{ -+ struct udev_monitor *udev_monitor = data; -+ int udev_fd = udev_monitor_get_fd(udev_monitor); -+ struct udev_device *udev_device; -+ const char *action; -+ -+ if (err < 0) -+ return; -+ -+ if (FD_ISSET(udev_fd, (fd_set *)read_mask)) { -+ udev_device = udev_monitor_receive_device(udev_monitor); -+ if (!udev_device) -+ return; -+ action = udev_device_get_action(udev_device); -+ if (!action) -+ ; -+ else if (!strcmp(action, "add")) -+ device_added(udev_device); -+ else if (!strcmp(action, "remove")) -+ device_removed(udev_device); -+ else -+ ErrorF("config/udev: unhandled action %s\n", action); -+ udev_device_unref(udev_device); -+ } -+} -+ -+static void -+block_handler(pointer data, struct timeval **tv, pointer read_mask) -+{ -+} -+ -+static struct udev_monitor *udev_monitor; -+static OsTimerPtr udev_timer; -+ -+static CARD32 -+connect_timer(OsTimerPtr timer, CARD32 time, pointer arg) { -+ int fd; -+ struct udev_enumerate *enumerate; -+ struct udev_list_entry *devices, *device; -+ struct udev *udev = udev_monitor_get_udev(udev_monitor); -+ -+ fd = udev_monitor_get_fd(udev_monitor); -+ enumerate = udev_enumerate_new(udev); -+ udev_enumerate_add_match_subsystem(enumerate, "input"); -+ udev_enumerate_scan_devices(enumerate); -+ if (udev_monitor_enable_receiving(udev_monitor)) { -+ ErrorF("config/udev: failed to bind the udev monitor\n"); -+ goto unwind; -+ } -+ devices = udev_enumerate_get_list_entry(enumerate); -+ udev_list_entry_foreach(device, devices) { -+ const char *syspath = udev_list_entry_get_name(device); -+ struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath); -+ device_added(udev_device); -+ udev_device_unref(udev_device); -+ } -+ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor); -+ AddGeneralSocket(fd); -+ unwind: -+ udev_enumerate_unref(enumerate); -+ if (udev_timer) { -+ TimerFree(udev_timer); -+ udev_timer = NULL; -+ } -+ return 0; -+} -+ -+int -+config_udev_init(void) { -+ struct udev *udev; -+ -+ udev = udev_new(); -+ udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); -+ if (!udev_monitor) -+ return 0; -+ udev_timer = TimerSet(NULL, 0, 1, connect_timer, NULL); -+ if (!udev_timer) -+ return 0; -+ return 1; -+} -+ -+void -+config_udev_fini(void) -+{ -+ struct udev *udev = udev_monitor_get_udev(udev_monitor); -+ if (udev_timer) { -+ TimerFree(udev_timer); -+ udev_timer = NULL; -+ } -+ RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor)); -+ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor); -+ udev_monitor_unref(udev_monitor); -+ udev_monitor = NULL; -+ udev_unref(udev); -+} -diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure ---- xorg-server-1.7.99.1/configure 2009-11-15 20:28:35.561356330 +0100 -+++ xorg-server-1.7.99.1.patch/configure 2009-11-15 21:03:49.864231133 +0100 -@@ -1065,6 +1065,10 @@ - HAVE_DBUS_TRUE - DBUS_LIBS - DBUS_CFLAGS -+CONFIG_UDEV_FALSE -+CONFIG_UDEV_TRUE -+UDEV_LIBS -+UDEV_CFLAGS - INSTALL_LIBXF86CONFIG_FALSE - INSTALL_LIBXF86CONFIG_TRUE - MAKE_HTML -@@ -1344,6 +1348,7 @@ - enable_dbe - enable_xf86bigfont - enable_dpms -+enable_config_udev - enable_config_dbus - enable_config_hal - enable_xfree86_utils -@@ -1384,6 +1389,8 @@ - PKG_CONFIG - YACC - YFLAGS -+UDEV_CFLAGS -+UDEV_LIBS - DBUS_CFLAGS - DBUS_LIBS - HAL_CFLAGS -@@ -2129,6 +2136,7 @@ - --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: 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) -@@ -2155,7 +2163,7 @@ - (default: auto) - --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 - --enable-secure-rpc Enable Secure RPC -@@ -2239,6 +2247,8 @@ - YFLAGS The list of arguments that will be passed by default to $YACC. - This script will default YFLAGS to the empty string to avoid a - default value of `-d' given by some make applications. -+ UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config -+ UDEV_LIBS linker flags for UDEV, overriding pkg-config - DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config - DBUS_LIBS linker flags for DBUS, overriding pkg-config - HAL_CFLAGS C compiler flags for HAL, overriding pkg-config -@@ -5757,13 +5767,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5760: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:5770: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:5763: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:5773: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:5766: output\"" >&5) -+ (eval echo "\"\$as_me:5776: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -6955,7 +6965,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6958 "configure"' > conftest.$ac_ext -+ echo '#line 6968 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8780,11 +8790,11 @@ - -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:8783: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8793: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8787: \$? = $ac_status" >&5 -+ echo "$as_me:8797: \$? = $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. -@@ -9119,11 +9129,11 @@ - -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:9122: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9132: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9126: \$? = $ac_status" >&5 -+ echo "$as_me:9136: \$? = $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. -@@ -9224,11 +9234,11 @@ - -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:9227: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9237: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9231: \$? = $ac_status" >&5 -+ echo "$as_me:9241: \$? = $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 -@@ -9279,11 +9289,11 @@ - -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:9282: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9292: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9286: \$? = $ac_status" >&5 -+ echo "$as_me:9296: \$? = $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 -@@ -12095,7 +12105,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12098 "configure" -+#line 12108 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12191,7 +12201,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12194 "configure" -+#line 12204 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -20492,6 +20502,13 @@ - DPMSExtension=yes - fi - -+# Check whether --enable-config-udev was given. -+if test "${enable_config_udev+set}" = set; then -+ enableval=$enable_config_udev; CONFIG_UDEV=$enableval -+else -+ CONFIG_UDEV=auto -+fi -+ - # Check whether --enable-config-dbus was given. - if test "${enable_config_dbus+set}" = set; then - enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval -@@ -20936,76 +20953,6 @@ - fi - - --{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 --$as_echo_n "checking for main in -lws2_32... " >&6; } --if test "${ac_cv_lib_ws2_32_main+set}" = set; then -- $as_echo_n "(cached) " >&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 () --{ --return main (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_ws2_32_main=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_ws2_32_main=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5 --$as_echo "$ac_cv_lib_ws2_32_main" >&6; } --if test "x$ac_cv_lib_ws2_32_main" = x""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 was given. - if test "${enable_ipv6+set}" = set; then -@@ -22079,16 +22026,115 @@ - LIBPCIACCESS="pciaccess >= 0.8.0" - LIBGLIB="glib-2.0 >= 2.16" - -+if test "x$CONFIG_UDEV" = xyes && -+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then -+ { { $as_echo "$as_me:$LINENO: error: Hotplugging through both libudev and dbus/hal not allowed" >&5 -+$as_echo "$as_me: error: Hotplugging through both libudev and dbus/hal not allowed" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5 -+$as_echo_n "checking for UDEV... " >&6; } -+ -+if test -n "$UDEV_CFLAGS"; then -+ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 143" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$UDEV_LIBS"; then -+ pkg_cv_UDEV_LIBS="$UDEV_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 143" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= 143" 2>&1` -+ else -+ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 143" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$UDEV_PKG_ERRORS" >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ HAVE_LIBUDEV=no -+elif test $pkg_failed = untried; then -+ HAVE_LIBUDEV=no -+else -+ UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS -+ UDEV_LIBS=$pkg_cv_UDEV_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ HAVE_LIBUDEV=yes -+fi -+if test "x$CONFIG_UDEV" = xauto; then -+ CONFIG_UDEV="$HAVE_LIBUDEV" -+fi -+ if test "x$CONFIG_UDEV" = xyes; then -+ CONFIG_UDEV_TRUE= -+ CONFIG_UDEV_FALSE='#' -+else -+ CONFIG_UDEV_TRUE='#' -+ CONFIG_UDEV_FALSE= -+fi -+ -+if test "x$CONFIG_UDEV" = xyes; then -+ CONFIG_DBUS_API=no -+ CONFIG_HAL=no -+ if ! test "x$HAVE_LIBUDEV" = xyes; then -+ { { $as_echo "$as_me:$LINENO: error: udev configuration API requested, but libudev is not installed" >&5 -+$as_echo "$as_me: error: udev configuration API requested, but libudev is not installed" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_UDEV 1 -+_ACEOF -+ -+fi -+ - - pkg_failed=no - { $as_echo "$as_me:$LINENO: checking for DBUS" >&5 - $as_echo_n "checking for DBUS... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DBUS_CFLAGS"; then -- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DBUS_CFLAGS"; then -+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? -@@ -22098,15 +22144,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DBUS_LIBS"; then -- pkg_cv_DBUS_LIBS="$DBUS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DBUS_LIBS"; then -+ pkg_cv_DBUS_LIBS="$DBUS_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? -@@ -22116,9 +22160,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -22131,9 +22174,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"` -+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` - else -- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` -+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 -@@ -22197,11 +22240,10 @@ - { $as_echo "$as_me:$LINENO: checking for HAL" >&5 - $as_echo_n "checking for HAL... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$HAL_CFLAGS"; then -- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$HAL_CFLAGS"; then -+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 - ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? -@@ -22211,15 +22253,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$HAL_LIBS"; then -- pkg_cv_HAL_LIBS="$HAL_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$HAL_LIBS"; then -+ pkg_cv_HAL_LIBS="$HAL_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 - ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? -@@ -22229,9 +22269,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -22244,9 +22283,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"` -+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1` - else -- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"` -+ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$HAL_PKG_ERRORS" >&5 -@@ -22278,7 +22317,6 @@ - #define CONFIG_HAL 1 - _ACEOF - -- REQUIRED_LIBS="$REQUIRED_LIBS hal" - CONFIG_NEED_DBUS="yes" - fi - if test "x$CONFIG_HAL" = xyes; then -@@ -22291,7 +22329,6 @@ - - - if test "x$CONFIG_NEED_DBUS" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" - - cat >>confdefs.h <<\_ACEOF - #define CONFIG_NEED_DBUS 1 -@@ -22776,11 +22813,10 @@ - { $as_echo "$as_me:$LINENO: checking for XLIB" >&5 - $as_echo_n "checking for XLIB... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XLIB_CFLAGS"; then -- pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XLIB_CFLAGS"; then -+ pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11") 2>&5 - ac_status=$? -@@ -22790,15 +22826,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XLIB_LIBS"; then -- pkg_cv_XLIB_LIBS="$XLIB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XLIB_LIBS"; then -+ pkg_cv_XLIB_LIBS="$XLIB_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11") 2>&5 - ac_status=$? -@@ -22808,9 +22842,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -22823,9 +22856,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` -+ XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1` - else -- XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` -+ XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XLIB_PKG_ERRORS" >&5 -@@ -22889,11 +22922,10 @@ - { $as_echo "$as_me:$LINENO: checking for GL" >&5 - $as_echo_n "checking for GL... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$GL_CFLAGS"; then -- pkg_cv_GL_CFLAGS="$GL_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$GL_CFLAGS"; then -+ pkg_cv_GL_CFLAGS="$GL_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 - ac_status=$? -@@ -22903,15 +22935,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$GL_LIBS"; then -- pkg_cv_GL_LIBS="$GL_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$GL_LIBS"; then -+ pkg_cv_GL_LIBS="$GL_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 - ac_status=$? -@@ -22921,9 +22951,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -22936,9 +22965,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1` - else -- GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` -+ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 -@@ -23060,11 +23089,10 @@ - { $as_echo "$as_me:$LINENO: checking for DRIPROTO" >&5 - $as_echo_n "checking for DRIPROTO... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DRIPROTO_CFLAGS"; then -- pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRIPROTO_CFLAGS"; then -+ pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 - ac_status=$? -@@ -23074,15 +23102,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRIPROTO_LIBS"; then -- pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRIPROTO_LIBS"; then -+ pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 - ac_status=$? -@@ -23092,9 +23118,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -23107,9 +23132,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"` -+ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1` - else -- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"` -+ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRIPROTO_PKG_ERRORS" >&5 -@@ -23173,11 +23198,10 @@ - { $as_echo "$as_me:$LINENO: checking for DRI" >&5 - $as_echo_n "checking for DRI... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI_CFLAGS"; then -- pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRI_CFLAGS"; then -+ pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 - ac_status=$? -@@ -23187,15 +23211,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI_LIBS"; then -- pkg_cv_DRI_LIBS="$DRI_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRI_LIBS"; then -+ pkg_cv_DRI_LIBS="$DRI_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 - ac_status=$? -@@ -23205,9 +23227,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -23220,9 +23241,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -+ DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1` - else -- DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` -+ DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRI_PKG_ERRORS" >&5 -@@ -23289,11 +23310,10 @@ - { $as_echo "$as_me:$LINENO: checking for DRI2PROTO" >&5 - $as_echo_n "checking for DRI2PROTO... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI2PROTO_CFLAGS"; then -- pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRI2PROTO_CFLAGS"; then -+ pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 - ac_status=$? -@@ -23303,15 +23323,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DRI2PROTO_LIBS"; then -- pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DRI2PROTO_LIBS"; then -+ pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 - ac_status=$? -@@ -23321,9 +23339,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -23336,9 +23353,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"` -+ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1` - else -- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"` -+ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DRI2PROTO_PKG_ERRORS" >&5 -@@ -23385,11 +23402,10 @@ - { $as_echo "$as_me:$LINENO: checking for LIBDRM" >&5 - $as_echo_n "checking for LIBDRM... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBDRM_CFLAGS"; then -- pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$LIBDRM_CFLAGS"; then -+ pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 - ac_status=$? -@@ -23399,15 +23415,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBDRM_LIBS"; then -- pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$LIBDRM_LIBS"; then -+ pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 - ac_status=$? -@@ -23417,9 +23431,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -23432,9 +23445,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"` -+ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1` - else -- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"` -+ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBDRM_PKG_ERRORS" >&5 -@@ -24762,11 +24775,10 @@ - { $as_echo "$as_me:$LINENO: checking for XDMCP" >&5 - $as_echo_n "checking for XDMCP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMCP_CFLAGS"; then -- pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XDMCP_CFLAGS"; then -+ pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 - ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? -@@ -24776,15 +24788,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMCP_LIBS"; then -- pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XDMCP_LIBS"; then -+ pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 - ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 - ac_status=$? -@@ -24794,9 +24804,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -24809,9 +24818,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` -+ XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1` - else -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` -+ XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XDMCP_PKG_ERRORS" >&5 -@@ -25136,11 +25145,10 @@ - { $as_echo "$as_me:$LINENO: checking for GLIB" >&5 - $as_echo_n "checking for GLIB... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_CFLAGS"; then -- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$GLIB_CFLAGS"; then -+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 - ac_status=$? -@@ -25150,15 +25158,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$GLIB_LIBS"; then -- pkg_cv_GLIB_LIBS="$GLIB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$GLIB_LIBS"; then -+ pkg_cv_GLIB_LIBS="$GLIB_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 - ac_status=$? -@@ -25168,9 +25174,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -25183,9 +25188,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"` -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1` - else -- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"` -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 -@@ -25527,11 +25532,10 @@ - { $as_echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5 - $as_echo_n "checking for XSERVERCFLAGS... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERCFLAGS_CFLAGS"; then -- pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XSERVERCFLAGS_CFLAGS"; then -+ pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -25541,15 +25545,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERCFLAGS_LIBS"; then -- pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XSERVERCFLAGS_LIBS"; then -+ pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -25559,9 +25561,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -25574,9 +25575,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` - else -- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` -+ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 -@@ -25640,11 +25641,10 @@ - { $as_echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5 - $as_echo_n "checking for XSERVERLIBS... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERLIBS_CFLAGS"; then -- pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XSERVERLIBS_CFLAGS"; then -+ pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -25654,15 +25654,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XSERVERLIBS_LIBS"; then -- pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XSERVERLIBS_LIBS"; then -+ pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -25672,9 +25670,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -25687,9 +25684,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -+ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1` - else -- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` -+ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XSERVERLIBS_PKG_ERRORS" >&5 -@@ -25849,11 +25846,10 @@ - { $as_echo "$as_me:$LINENO: checking for XNESTMODULES" >&5 - $as_echo_n "checking for XNESTMODULES... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XNESTMODULES_CFLAGS"; then -- pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XNESTMODULES_CFLAGS"; then -+ pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 - ac_status=$? -@@ -25863,15 +25859,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XNESTMODULES_LIBS"; then -- pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XNESTMODULES_LIBS"; then -+ pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 - ac_status=$? -@@ -25881,9 +25875,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -25896,9 +25889,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` -+ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` - else -- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` -+ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XNESTMODULES_PKG_ERRORS" >&5 -@@ -26107,11 +26100,10 @@ - { $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5 - $as_echo_n "checking for PCIACCESS... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$PCIACCESS_CFLAGS"; then -- pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$PCIACCESS_CFLAGS"; then -+ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 - ac_status=$? -@@ -26121,15 +26113,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$PCIACCESS_LIBS"; then -- pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$PCIACCESS_LIBS"; then -+ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 - ac_status=$? -@@ -26139,9 +26129,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -26154,9 +26143,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"` -+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1` - else -- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"` -+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$PCIACCESS_PKG_ERRORS" >&5 -@@ -27184,11 +27173,10 @@ - { $as_echo "$as_me:$LINENO: checking for DGA" >&5 - $as_echo_n "checking for DGA... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DGA_CFLAGS"; then -- pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DGA_CFLAGS"; then -+ pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -@@ -27198,15 +27186,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DGA_LIBS"; then -- pkg_cv_DGA_LIBS="$DGA_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DGA_LIBS"; then -+ pkg_cv_DGA_LIBS="$DGA_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -@@ -27216,9 +27202,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -27231,9 +27216,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` -+ DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` - else -- DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` -+ DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DGA_PKG_ERRORS" >&5 -@@ -27258,11 +27243,10 @@ - { $as_echo "$as_me:$LINENO: checking for DGA" >&5 - $as_echo_n "checking for DGA... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DGA_CFLAGS"; then -- pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DGA_CFLAGS"; then -+ pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -@@ -27272,15 +27256,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DGA_LIBS"; then -- pkg_cv_DGA_LIBS="$DGA_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DGA_LIBS"; then -+ pkg_cv_DGA_LIBS="$DGA_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 - ac_status=$? -@@ -27290,9 +27272,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -27305,9 +27286,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` -+ DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` - else -- DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` -+ DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DGA_PKG_ERRORS" >&5 -@@ -27384,11 +27365,10 @@ - { $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 - $as_echo_n "checking for XF86VIDMODE... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XF86VIDMODE_CFLAGS"; then -- pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XF86VIDMODE_CFLAGS"; then -+ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -@@ -27398,15 +27378,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XF86VIDMODE_LIBS"; then -- pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XF86VIDMODE_LIBS"; then -+ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -@@ -27416,9 +27394,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -27431,9 +27408,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` -+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` - else -- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` -+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XF86VIDMODE_PKG_ERRORS" >&5 -@@ -27458,11 +27435,10 @@ - { $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 - $as_echo_n "checking for XF86VIDMODE... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XF86VIDMODE_CFLAGS"; then -- pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XF86VIDMODE_CFLAGS"; then -+ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -@@ -27472,15 +27448,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XF86VIDMODE_LIBS"; then -- pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XF86VIDMODE_LIBS"; then -+ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 - ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 - ac_status=$? -@@ -27490,9 +27464,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -27505,9 +27478,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` -+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` - else -- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` -+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XF86VIDMODE_PKG_ERRORS" >&5 -@@ -27579,11 +27552,10 @@ - { $as_echo "$as_me:$LINENO: checking for XORG_MODULES" >&5 - $as_echo_n "checking for XORG_MODULES... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XORG_MODULES_CFLAGS"; then -- pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XORG_MODULES_CFLAGS"; then -+ pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 - ac_status=$? -@@ -27593,15 +27565,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XORG_MODULES_LIBS"; then -- pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XORG_MODULES_LIBS"; then -+ pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 - ac_status=$? -@@ -27611,9 +27581,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -27626,9 +27595,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"` -+ XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1` - else -- XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"` -+ XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XORG_MODULES_PKG_ERRORS" >&5 -@@ -28133,11 +28102,10 @@ - { $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 - $as_echo_n "checking for XWINMODULES... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XWINMODULES_CFLAGS"; then -- pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XWINMODULES_CFLAGS"; then -+ pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -@@ -28147,15 +28115,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XWINMODULES_LIBS"; then -- pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XWINMODULES_LIBS"; then -+ pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -@@ -28165,9 +28131,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -28180,9 +28145,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` -+ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` - else -- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` -+ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 -@@ -28265,11 +28230,10 @@ - { $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 - $as_echo_n "checking for XWINMODULES... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XWINMODULES_CFLAGS"; then -- pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XWINMODULES_CFLAGS"; then -+ pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -@@ -28279,15 +28243,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XWINMODULES_LIBS"; then -- pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XWINMODULES_LIBS"; then -+ pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 - ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 - ac_status=$? -@@ -28297,9 +28259,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -28312,9 +28273,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` -+ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` - else -- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` -+ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 -@@ -28596,11 +28557,10 @@ - { $as_echo "$as_me:$LINENO: checking for XPBPROXY" >&5 - $as_echo_n "checking for XPBPROXY... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XPBPROXY_CFLAGS"; then -- pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XPBPROXY_CFLAGS"; then -+ pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 - ac_status=$? -@@ -28610,15 +28570,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XPBPROXY_LIBS"; then -- pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XPBPROXY_LIBS"; then -+ pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 - ac_status=$? -@@ -28628,9 +28586,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -28643,9 +28600,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` -+ XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` - else -- XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` -+ XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XPBPROXY_PKG_ERRORS" >&5 -@@ -28889,11 +28846,10 @@ - { $as_echo "$as_me:$LINENO: checking for DMXMODULES" >&5 - $as_echo_n "checking for DMXMODULES... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXMODULES_CFLAGS"; then -- pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXMODULES_CFLAGS"; then -+ pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 - ac_status=$? -@@ -28903,15 +28859,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXMODULES_LIBS"; then -- pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXMODULES_LIBS"; then -+ pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 - ac_status=$? -@@ -28921,9 +28875,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -28936,9 +28889,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` -+ DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` - else -- DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` -+ DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DMXMODULES_PKG_ERRORS" >&5 -@@ -29276,11 +29229,10 @@ - { $as_echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5 - $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMXCONFIG_DEP_CFLAGS"; then -- pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XDMXCONFIG_DEP_CFLAGS"; then -+ pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 - ac_status=$? -@@ -29290,15 +29242,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XDMXCONFIG_DEP_LIBS"; then -- pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XDMXCONFIG_DEP_LIBS"; then -+ pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 - ac_status=$? -@@ -29308,9 +29258,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29323,9 +29272,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` -+ XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1` - else -- XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` -+ XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5 -@@ -29391,11 +29340,10 @@ - { $as_echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then -- pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29405,15 +29353,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXEXAMPLES_DEP_LIBS"; then -- pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXEXAMPLES_DEP_LIBS"; then -+ pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29423,9 +29369,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29438,9 +29383,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` -+ DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` - else -- DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` -+ DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -29505,11 +29450,10 @@ - { $as_echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then -- pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29519,15 +29463,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then -- pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then -+ pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29537,9 +29479,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29552,9 +29493,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` -+ DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` - else -- DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` -+ DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -29619,11 +29560,10 @@ - { $as_echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5 - $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then -- pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29633,15 +29573,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then -- pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then -+ pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29651,9 +29589,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29666,9 +29603,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` -+ DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` - else -- DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` -+ DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -29733,11 +29670,10 @@ - { $as_echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5 - $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then -- pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29747,15 +29683,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XTSTEXAMPLES_DEP_LIBS"; then -- pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XTSTEXAMPLES_DEP_LIBS"; then -+ pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29765,9 +29699,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29780,9 +29713,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` -+ XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` - else -- XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` -+ XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -29847,11 +29780,10 @@ - { $as_echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5 - $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then -- pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29861,15 +29793,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XRESEXAMPLES_DEP_LIBS"; then -- pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XRESEXAMPLES_DEP_LIBS"; then -+ pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29879,9 +29809,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -29894,9 +29823,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"` -+ XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1` - else -- XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"` -+ XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -29961,11 +29890,10 @@ - { $as_echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5 - $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$X11EXAMPLES_DEP_CFLAGS"; then -- pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$X11EXAMPLES_DEP_CFLAGS"; then -+ pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29975,15 +29903,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$X11EXAMPLES_DEP_LIBS"; then -- pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$X11EXAMPLES_DEP_LIBS"; then -+ pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 - ac_status=$? -@@ -29993,9 +29919,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -30008,9 +29933,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"` -+ X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1` - else -- X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"` -+ X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5 -@@ -30502,11 +30427,10 @@ - { $as_echo "$as_me:$LINENO: checking for TSLIB" >&5 - $as_echo_n "checking for TSLIB... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$TSLIB_CFLAGS"; then -- pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$TSLIB_CFLAGS"; then -+ pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 - ac_status=$? -@@ -30516,15 +30440,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$TSLIB_LIBS"; then -- pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$TSLIB_LIBS"; then -+ pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 - ac_status=$? -@@ -30534,9 +30456,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -30549,9 +30470,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"` -+ TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1` - else -- TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"` -+ TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$TSLIB_PKG_ERRORS" >&5 -@@ -30671,11 +30592,10 @@ - { $as_echo "$as_me:$LINENO: checking for XEPHYR" >&5 - $as_echo_n "checking for XEPHYR... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$XEPHYR_CFLAGS"; then -- pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XEPHYR_CFLAGS"; then -+ pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -30685,15 +30605,13 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi --if test -n "$PKG_CONFIG"; then -- if test -n "$XEPHYR_LIBS"; then -- pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -+if test -n "$XEPHYR_LIBS"; then -+ pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 - ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 - ac_status=$? -@@ -30703,9 +30621,8 @@ - else - pkg_failed=yes - fi -- fi --else -- pkg_failed=untried -+ else -+ pkg_failed=untried - fi - - -@@ -30718,9 +30635,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` -+ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` - else -- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` -+ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$XEPHYR_PKG_ERRORS" >&5 -@@ -31378,6 +31295,13 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${CONFIG_UDEV_TRUE}" && test -z "${CONFIG_UDEV_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_UDEV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"CONFIG_UDEV\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configure.ac ---- xorg-server-1.7.99.1/configure.ac 2009-11-15 20:28:35.563356346 +0100 -+++ xorg-server-1.7.99.1.patch/configure.ac 2009-11-15 20:28:56.137232562 +0100 -@@ -597,6 +597,7 @@ - AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) - AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) - AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) -+AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) - AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) - AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) - AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -@@ -755,6 +756,25 @@ - LIBPCIACCESS="pciaccess >= 0.8.0" - LIBGLIB="glib-2.0 >= 2.16" - -+if test "x$CONFIG_UDEV" = xyes && -+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then -+ AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed]) -+fi -+ -+PKG_CHECK_MODULES(UDEV, libudev >= 143, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) -+if test "x$CONFIG_UDEV" = xauto; then -+ CONFIG_UDEV="$HAVE_LIBUDEV" -+fi -+AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes]) -+if test "x$CONFIG_UDEV" = xyes; then -+ CONFIG_DBUS_API=no -+ CONFIG_HAL=no -+ if ! test "x$HAVE_LIBUDEV" = xyes; then -+ AC_MSG_ERROR([udev configuration API requested, but libudev is not installed]) -+ fi -+ AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug]) -+fi -+ - dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas - dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config - dnl API. -@@ -787,13 +807,11 @@ - fi - - AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) -- REQUIRED_LIBS="$REQUIRED_LIBS hal" - CONFIG_NEED_DBUS="yes" - fi - AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) - - if test "x$CONFIG_NEED_DBUS" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" - AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug]) - fi - AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes]) -diff -Naur xorg-server-1.7.99.1/damageext/Makefile.in xorg-server-1.7.99.1.patch/damageext/Makefile.in ---- xorg-server-1.7.99.1/damageext/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/damageext/Makefile.in 2009-11-15 21:03:55.700356175 +0100 -@@ -230,7 +230,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -252,6 +251,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/dbe/Makefile.in xorg-server-1.7.99.1.patch/dbe/Makefile.in ---- xorg-server-1.7.99.1/dbe/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/dbe/Makefile.in 2009-11-15 21:03:55.860356178 +0100 -@@ -256,7 +256,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -278,6 +277,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/dix/Makefile.in xorg-server-1.7.99.1.patch/dix/Makefile.in ---- xorg-server-1.7.99.1/dix/Makefile.in 2009-10-21 18:07:09.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/dix/Makefile.in 2009-11-15 21:03:56.052356602 +0100 -@@ -270,7 +270,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -292,6 +291,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/doc/Makefile.in xorg-server-1.7.99.1.patch/doc/Makefile.in ---- xorg-server-1.7.99.1/doc/Makefile.in 2009-10-21 18:07:09.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/doc/Makefile.in 2009-11-15 21:03:56.192356360 +0100 -@@ -233,7 +233,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -255,6 +254,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/exa/Makefile.in xorg-server-1.7.99.1.patch/exa/Makefile.in ---- xorg-server-1.7.99.1/exa/Makefile.in 2009-10-21 18:07:09.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/exa/Makefile.in 2009-11-15 21:03:56.350356206 +0100 -@@ -258,7 +258,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -283,6 +282,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/fb/Makefile.in xorg-server-1.7.99.1.patch/fb/Makefile.in ---- xorg-server-1.7.99.1/fb/Makefile.in 2009-10-21 18:07:09.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/fb/Makefile.in 2009-11-15 21:03:56.847356366 +0100 -@@ -286,7 +286,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -308,6 +307,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/glx/Makefile.in xorg-server-1.7.99.1.patch/glx/Makefile.in ---- xorg-server-1.7.99.1/glx/Makefile.in 2009-10-21 18:07:10.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/glx/Makefile.in 2009-11-15 21:03:57.035356475 +0100 -@@ -249,7 +249,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -271,6 +270,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/config/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/config/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/config/Makefile.in 2009-10-21 18:07:10.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/config/Makefile.in 2009-11-15 21:03:57.603356138 +0100 -@@ -292,7 +292,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -314,6 +313,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/doc/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/doc/Makefile.in 2009-10-21 18:07:10.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/doc/Makefile.in 2009-11-15 21:03:57.747356351 +0100 -@@ -227,7 +227,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -249,6 +248,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/examples/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/examples/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/examples/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/examples/Makefile.in 2009-11-15 21:03:58.062356105 +0100 -@@ -334,7 +334,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -356,6 +355,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/glxProxy/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/glxProxy/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/glxProxy/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/glxProxy/Makefile.in 2009-11-15 21:03:58.218355235 +0100 -@@ -241,7 +241,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -263,6 +262,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/input/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/input/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/input/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/input/Makefile.in 2009-11-15 21:03:58.407356749 +0100 -@@ -255,7 +255,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -277,6 +276,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/dmx/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/Makefile.in ---- xorg-server-1.7.99.1/hw/dmx/Makefile.in 2009-10-21 18:07:10.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/dmx/Makefile.in 2009-11-15 21:03:57.369356115 +0100 -@@ -319,7 +319,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -341,6 +340,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/ephyr/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/ephyr/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/ephyr/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/ephyr/Makefile.in 2009-11-15 21:03:58.727355778 +0100 -@@ -293,7 +293,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -315,6 +314,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/fake/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/fake/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/fake/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/fake/Makefile.in 2009-11-15 21:03:58.890356018 +0100 -@@ -239,7 +239,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -261,6 +260,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/fbdev/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/fbdev/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/fbdev/Makefile.in 2009-10-21 18:07:12.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/fbdev/Makefile.in 2009-11-15 21:03:59.070231178 +0100 -@@ -240,7 +240,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -262,6 +261,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/linux/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/linux/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/linux/Makefile.in 2009-10-21 18:07:12.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/linux/Makefile.in 2009-11-15 21:03:59.224231478 +0100 -@@ -235,7 +235,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -257,6 +256,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/Makefile.in 2009-10-21 18:07:11.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/Makefile.in 2009-11-15 21:03:58.541355617 +0100 -@@ -243,7 +243,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -265,6 +264,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/kdrive/src/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/src/Makefile.in ---- xorg-server-1.7.99.1/hw/kdrive/src/Makefile.in 2009-10-21 18:07:12.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/kdrive/src/Makefile.in 2009-11-15 21:03:59.393231420 +0100 -@@ -240,7 +240,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -262,6 +261,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/Makefile.in xorg-server-1.7.99.1.patch/hw/Makefile.in ---- xorg-server-1.7.99.1/hw/Makefile.in 2009-10-21 18:07:10.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/Makefile.in 2009-11-15 21:03:57.172356486 +0100 -@@ -243,7 +243,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -265,6 +264,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/vfb/Makefile.in xorg-server-1.7.99.1.patch/hw/vfb/Makefile.in ---- xorg-server-1.7.99.1/hw/vfb/Makefile.in 2009-10-21 18:07:12.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/vfb/Makefile.in 2009-11-15 21:03:59.593231285 +0100 -@@ -277,7 +277,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -299,6 +298,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/common/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/common/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/common/Makefile.in 2009-11-15 21:03:59.953231643 +0100 -@@ -282,7 +282,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -304,6 +303,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86Config.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Config.c ---- xorg-server-1.7.99.1/hw/xfree86/common/xf86Config.c 2009-10-13 19:04:27.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Config.c 2009-11-15 20:28:56.144233245 +0100 -@@ -1457,6 +1457,10 @@ - xf86Msg(X_INFO, "The server relies on HAL to provide the list of " - "input devices.\n\tIf no devices become available, " - "reconfigure HAL or disable AllowEmptyInput.\n"); -+#elif CONFIG_UDEV -+ xf86Msg(X_INFO, "The server relies on udev to provide the list of " -+ "input devices.\n\tIf no devices become available, " -+ "reconfigure udev or disable AllowEmptyInput.\n"); - #else - xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" - "\tTry disabling AllowEmptyInput.\n"); -diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86Globals.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Globals.c ---- xorg-server-1.7.99.1/hw/xfree86/common/xf86Globals.c 2009-10-13 19:04:27.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Globals.c 2009-11-15 20:28:56.189232342 +0100 -@@ -132,7 +132,7 @@ - .kbdCustomKeycodes = FALSE, - .disableRandR = FALSE, - .randRFrom = X_DEFAULT, --#ifdef CONFIG_HAL -+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) - .allowEmptyInput = TRUE, - .autoAddDevices = TRUE, - .autoEnableDevices = TRUE -diff -Naur xorg-server-1.7.99.1/hw/xfree86/ddc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/ddc/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/ddc/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/ddc/Makefile.in 2009-11-15 21:04:00.137231087 +0100 -@@ -256,7 +256,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -278,6 +277,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/dixmods/extmod/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/extmod/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/dixmods/extmod/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/extmod/Makefile.in 2009-11-15 21:04:00.547230975 +0100 -@@ -264,7 +264,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -286,6 +285,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/dixmods/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/dixmods/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/Makefile.in 2009-11-15 21:04:00.375231983 +0100 -@@ -344,7 +344,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -366,6 +365,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/devel/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/devel/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/doc/devel/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/devel/Makefile.in 2009-11-15 21:04:00.819231888 +0100 -@@ -207,7 +207,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -229,6 +228,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/doc/Makefile.in 2009-10-21 18:07:13.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/Makefile.in 2009-11-15 21:04:00.688231650 +0100 -@@ -244,7 +244,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -266,6 +265,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/man/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/man/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/doc/man/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/man/Makefile.in 2009-11-15 21:04:00.989231281 +0100 -@@ -233,7 +233,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -255,6 +254,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/sgml/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/sgml/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/doc/sgml/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/sgml/Makefile.in 2009-11-15 21:04:01.143230952 +0100 -@@ -227,7 +227,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -249,6 +248,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/dri/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dri/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/dri/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/dri/Makefile.in 2009-11-15 21:04:01.331231690 +0100 -@@ -259,7 +259,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -281,6 +280,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/dri2/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dri2/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/dri2/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/dri2/Makefile.in 2009-11-15 21:04:01.510231651 +0100 -@@ -258,7 +258,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -280,6 +279,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/exa/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/exa/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/exa/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/exa/Makefile.in 2009-11-15 21:04:01.685230667 +0100 -@@ -262,7 +262,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -284,6 +283,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/fbdevhw/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/fbdevhw/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/fbdevhw/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/fbdevhw/Makefile.in 2009-11-15 21:04:01.864231117 +0100 -@@ -267,7 +267,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -289,6 +288,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/i2c/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/i2c/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/i2c/Makefile.in 2009-10-21 18:07:14.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/i2c/Makefile.in 2009-11-15 21:04:02.088230843 +0100 -@@ -308,7 +308,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -330,6 +329,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/int10/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/int10/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/int10/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/int10/Makefile.in 2009-11-15 21:04:02.283231362 +0100 -@@ -272,7 +272,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -294,6 +293,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/loader/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/loader/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/loader/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/loader/Makefile.in 2009-11-15 21:04:02.445231034 +0100 -@@ -231,7 +231,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -253,6 +252,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/Makefile.in 2009-10-21 18:07:12.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/Makefile.in 2009-11-15 21:03:59.774231612 +0100 -@@ -290,7 +290,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -312,6 +311,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/modes/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/modes/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/modes/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/modes/Makefile.in 2009-11-15 21:04:02.616230644 +0100 -@@ -262,7 +262,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -284,6 +283,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/bsd/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bsd/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/bsd/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bsd/Makefile.in 2009-11-15 21:04:03.064231283 +0100 -@@ -256,7 +256,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -278,6 +277,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/bus/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bus/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/bus/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bus/Makefile.in 2009-11-15 21:04:03.243231523 +0100 -@@ -264,7 +264,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -286,6 +285,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/hurd/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/hurd/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/hurd/Makefile.in 2009-10-21 18:07:16.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/hurd/Makefile.in 2009-11-15 21:04:03.693356359 +0100 -@@ -232,7 +232,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -254,6 +253,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/linux/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/linux/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/linux/Makefile.in 2009-10-21 18:07:16.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/linux/Makefile.in 2009-11-15 21:04:04.089356054 +0100 -@@ -257,7 +257,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -279,6 +278,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/Makefile.in 2009-10-21 18:07:15.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/Makefile.in 2009-11-15 21:04:02.785230657 +0100 -@@ -293,7 +293,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -315,6 +314,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/misc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/misc/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/misc/Makefile.in 2009-10-21 18:07:16.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/misc/Makefile.in 2009-11-15 21:04:04.250356135 +0100 -@@ -230,7 +230,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -252,6 +251,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/sco/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sco/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/sco/Makefile.in 2009-10-21 18:07:16.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sco/Makefile.in 2009-11-15 21:04:04.383356042 +0100 -@@ -204,7 +204,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -226,6 +225,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/solaris/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/solaris/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/solaris/Makefile.in 2009-10-21 18:07:17.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/solaris/Makefile.in 2009-11-15 21:04:04.613356589 +0100 -@@ -279,7 +279,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -301,6 +300,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/sysv/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sysv/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/os-support/sysv/Makefile.in 2009-10-21 18:07:17.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sysv/Makefile.in 2009-11-15 21:04:04.749356592 +0100 -@@ -204,7 +204,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -226,6 +225,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/parser/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/parser/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/parser/Makefile.in 2009-10-21 18:07:17.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/parser/Makefile.in 2009-11-15 21:04:05.064356555 +0100 -@@ -287,7 +287,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -309,6 +308,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/ramdac/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/ramdac/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/ramdac/Makefile.in 2009-10-21 18:07:17.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/ramdac/Makefile.in 2009-11-15 21:04:05.239356550 +0100 -@@ -256,7 +256,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -278,6 +277,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/shadowfb/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/shadowfb/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/shadowfb/Makefile.in 2009-10-21 18:07:17.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/shadowfb/Makefile.in 2009-11-15 21:04:05.406356196 +0100 -@@ -259,7 +259,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -281,6 +280,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/cvt/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/cvt/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/utils/cvt/Makefile.in 2009-10-21 18:07:18.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/cvt/Makefile.in 2009-11-15 21:04:05.737356509 +0100 -@@ -292,7 +292,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -314,6 +313,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/gtf/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/gtf/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/utils/gtf/Makefile.in 2009-10-21 18:07:18.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/gtf/Makefile.in 2009-11-15 21:04:05.921356164 +0100 -@@ -291,7 +291,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -313,6 +312,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/utils/Makefile.in 2009-10-21 18:07:18.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/Makefile.in 2009-11-15 21:04:05.547356662 +0100 -@@ -244,7 +244,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -266,6 +265,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/vbe/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/vbe/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/vbe/Makefile.in 2009-10-21 18:07:18.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/vbe/Makefile.in 2009-11-15 21:04:06.113356587 +0100 -@@ -258,7 +258,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -280,6 +279,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/vgahw/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/vgahw/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/vgahw/Makefile.in 2009-10-21 18:07:18.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/vgahw/Makefile.in 2009-11-15 21:04:06.285356346 +0100 -@@ -258,7 +258,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -280,6 +279,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/x86emu/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/x86emu/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/x86emu/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/x86emu/Makefile.in 2009-11-15 21:04:06.449356245 +0100 -@@ -231,7 +231,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -253,6 +252,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/xaa/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/xaa/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/xaa/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/xaa/Makefile.in 2009-11-15 21:04:06.644356834 +0100 -@@ -278,7 +278,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -300,6 +299,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xfree86/xf8_16bpp/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/xf8_16bpp/Makefile.in ---- xorg-server-1.7.99.1/hw/xfree86/xf8_16bpp/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xfree86/xf8_16bpp/Makefile.in 2009-11-15 21:04:06.822356436 +0100 -@@ -259,7 +259,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -281,6 +280,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xnest/Makefile.in xorg-server-1.7.99.1.patch/hw/xnest/Makefile.in ---- xorg-server-1.7.99.1/hw/xnest/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xnest/Makefile.in 2009-11-15 21:04:07.061356154 +0100 -@@ -280,7 +280,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -302,6 +301,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/bundle/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/bundle/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/bundle/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/bundle/Makefile.in 2009-11-15 21:04:07.568356191 +0100 -@@ -237,7 +237,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -259,6 +258,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/doc/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/doc/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/doc/Makefile.in 2009-11-15 21:04:07.711356395 +0100 -@@ -233,7 +233,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -255,6 +254,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/GL/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/GL/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/GL/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/GL/Makefile.in 2009-11-15 21:04:07.226356340 +0100 -@@ -231,7 +231,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -253,6 +252,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/mach-startup/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/mach-startup/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/mach-startup/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/mach-startup/Makefile.in 2009-11-15 21:04:07.892356024 +0100 -@@ -268,7 +268,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -290,6 +289,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/Makefile.in 2009-10-21 18:07:19.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/Makefile.in 2009-11-15 21:04:07.419356564 +0100 -@@ -284,7 +284,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -306,6 +305,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/pbproxy/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/pbproxy/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/pbproxy/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/pbproxy/Makefile.in 2009-11-15 21:04:08.096355434 +0100 -@@ -255,7 +255,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -277,6 +276,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xquartz/xpr/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/xpr/Makefile.in ---- xorg-server-1.7.99.1/hw/xquartz/xpr/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xquartz/xpr/Makefile.in 2009-11-15 21:04:08.298356574 +0100 -@@ -232,7 +232,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -254,6 +253,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/hw/xwin/Makefile.in xorg-server-1.7.99.1.patch/hw/xwin/Makefile.in ---- xorg-server-1.7.99.1/hw/xwin/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/hw/xwin/Makefile.in 2009-11-15 21:04:08.561356292 +0100 -@@ -355,7 +355,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -377,6 +376,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/include/dix-config.h.in xorg-server-1.7.99.1.patch/include/dix-config.h.in ---- xorg-server-1.7.99.1/include/dix-config.h.in 2009-10-13 19:04:27.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/include/dix-config.h.in 2009-11-15 20:28:56.194233079 +0100 -@@ -384,6 +384,9 @@ - /* Support D-Bus */ - #undef HAVE_DBUS - -+/* Use libudev for input hotplug */ -+#undef CONFIG_UDEV -+ - /* Use D-Bus for input hotplug */ - #undef CONFIG_NEED_DBUS - -diff -Naur xorg-server-1.7.99.1/include/do-not-use-config.h.in xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in ---- xorg-server-1.7.99.1/include/do-not-use-config.h.in 2009-10-21 18:07:28.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in 2009-11-15 21:03:50.000000000 +0100 -@@ -36,6 +36,9 @@ - /* Use D-Bus for input hotplug */ - #undef CONFIG_NEED_DBUS - -+/* Use libudev for input hotplug */ -+#undef CONFIG_UDEV -+ - /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -@@ -226,9 +229,6 @@ - /* Define to 1 if you have the `selinux' library (-lselinux). */ - #undef HAVE_LIBSELINUX - --/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ --#undef HAVE_LIBWS2_32 -- - /* Define to 1 if you have the `link' function. */ - #undef HAVE_LINK - -@@ -448,9 +448,6 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - --/* Define to the home page for this package. */ --#undef PACKAGE_URL -- - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff -Naur xorg-server-1.7.99.1/include/do-not-use-config.h.in~ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in~ ---- xorg-server-1.7.99.1/include/do-not-use-config.h.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in~ 2009-11-15 20:29:18.000000000 +0100 -@@ -0,0 +1,746 @@ -+/* include/do-not-use-config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define if building universal (internal helper macro) */ -+#undef AC_APPLE_UNIVERSAL_BUILD -+ -+/* Build AIGLX loader */ -+#undef AIGLX -+ -+/* Default base font path */ -+#undef BASE_FONT_PATH -+ -+/* Support BigRequests extension */ -+#undef BIGREQS -+ -+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ -+#undef BSD44SOCKETS -+ -+/* Builder address */ -+#undef BUILDERADDR -+ -+/* Builder string */ -+#undef BUILDERSTRING -+ -+/* Default font path */ -+#undef COMPILEDDEFAULTFONTPATH -+ -+/* Support Composite Extension */ -+#undef COMPOSITE -+ -+/* Use the D-Bus input configuration API */ -+#undef CONFIG_DBUS_API -+ -+/* Use the HAL hotplug API */ -+#undef CONFIG_HAL -+ -+/* Use D-Bus for input hotplug */ -+#undef CONFIG_NEED_DBUS -+ -+/* Use libudev for input hotplug */ -+#undef CONFIG_UDEV -+ -+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP -+ systems. This function is required for `alloca.c' support on those systems. -+ */ -+#undef CRAY_STACKSEG_END -+ -+/* System is BSD-like */ -+#undef CSRG_BASED -+ -+/* Simple debug messages */ -+#undef CYGDEBUG -+ -+/* Debug window manager */ -+#undef CYGMULTIWINDOW_DEBUG -+ -+/* Debug messages for window handling */ -+#undef CYGWINDOWING_DEBUG -+ -+/* Define to 1 if using `alloca.c'. */ -+#undef C_ALLOCA -+ -+/* Support Damage extension */ -+#undef DAMAGE -+ -+/* Support DBE extension */ -+#undef DBE -+ -+/* Use ddxBeforeReset */ -+#undef DDXBEFORERESET -+ -+/* Use OsVendorVErrorF */ -+#undef DDXOSVERRORF -+ -+/* Enable debugging code */ -+#undef DEBUG -+ -+/* Default library install path */ -+#undef DEFAULT_LIBRARY_PATH -+ -+/* Default log location */ -+#undef DEFAULT_LOGPREFIX -+ -+/* Default module search path */ -+#undef DEFAULT_MODULE_PATH -+ -+/* Support DGA extension */ -+#undef DGA -+ -+/* Support DPMS extension */ -+#undef DPMSExtension -+ -+/* Build DRI2 extension */ -+#undef DRI2 -+ -+/* Build DRI2 AIGLX loader */ -+#undef DRI2_AIGLX -+ -+/* Default DRI driver path */ -+#undef DRI_DRIVER_PATH -+ -+/* Build GLX extension */ -+#undef GLXEXT -+ -+/* Support XDM-AUTH*-1 */ -+#undef HASXDMAUTH -+ -+/* System has /dev/xf86 aperture driver */ -+#undef HAS_APERTURE_DRV -+ -+/* Cygwin has /dev/windows for signaling new win32 messages */ -+#undef HAS_DEVWINDOWS -+ -+/* Have the 'getdtablesize' function. */ -+#undef HAS_GETDTABLESIZE -+ -+/* Have the 'getifaddrs' function. */ -+#undef HAS_GETIFADDRS -+ -+/* Have the 'getpeereid' function. */ -+#undef HAS_GETPEEREID -+ -+/* Have the 'getpeerucred' function. */ -+#undef HAS_GETPEERUCRED -+ -+/* Have the 'mmap' function. */ -+#undef HAS_MMAP -+ -+/* Define to 1 if NetBSD built-in MTRR support is available */ -+#undef HAS_MTRR_BUILTIN -+ -+/* MTRR support available */ -+#undef HAS_MTRR_SUPPORT -+ -+/* Support SHM */ -+#undef HAS_SHM -+ -+/* Have the 'strlcpy' function */ -+#undef HAS_STRLCPY -+ -+/* Use Windows sockets */ -+#undef HAS_WINSOCK -+ -+/* Define to 1 if you have `alloca', as a function or macro. */ -+#undef HAVE_ALLOCA -+ -+/* Define to 1 if you have and it should be used (not on Ultrix). -+ */ -+#undef HAVE_ALLOCA_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_ASM_MTRR_H -+ -+/* Define to 1 if you have the `authdes_create' function. */ -+#undef HAVE_AUTHDES_CREATE -+ -+/* Define to 1 if you have the `authdes_seccreate' function. */ -+#undef HAVE_AUTHDES_SECCREATE -+ -+/* "Have avc_netlink_acquire_fd" */ -+#undef HAVE_AVC_NETLINK_ACQUIRE_FD -+ -+/* Has backtrace support */ -+#undef HAVE_BACKTRACE -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_BYTESWAP_H -+ -+/* Have the 'cbrt' function */ -+#undef HAVE_CBRT -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+#undef HAVE_CLOCK_GETTIME -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DBM_H -+ -+/* Have D-Bus support */ -+#undef HAVE_DBUS -+ -+/* Define to 1 if you have the header file, and it defines `DIR'. -+ */ -+#undef HAVE_DIRENT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -+#undef HAVE_DOPRNT -+ -+/* Have execinfo.h */ -+#undef HAVE_EXECINFO_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_FCNTL_H -+ -+/* Define to 1 if you have the `ffs' function. */ -+#undef HAVE_FFS -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#undef HAVE_GETEUID -+ -+/* Define to 1 if you have the `getisax' function. */ -+#undef HAVE_GETISAX -+ -+/* Define to 1 if you have the `getopt' function. */ -+#undef HAVE_GETOPT -+ -+/* Define to 1 if you have the `getopt_long' function. */ -+#undef HAVE_GETOPT_LONG -+ -+/* Define to 1 if you have the `getuid' function. */ -+#undef HAVE_GETUID -+ -+/* Define to 1 if you have the `getzoneid' function. */ -+#undef HAVE_GETZONEID -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the `audit' library (-laudit). */ -+#undef HAVE_LIBAUDIT -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LIBAUDIT_H -+ -+/* Define to 1 if you have the `m' library (-lm). */ -+#undef HAVE_LIBM -+ -+/* Define to 1 if you have the `selinux' library (-lselinux). */ -+#undef HAVE_LIBSELINUX -+ -+/* Define to 1 if you have the `link' function. */ -+#undef HAVE_LINK -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LINUX_AGPGART_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LINUX_APM_BIOS_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LINUX_FB_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MACHINE_MTRR_H -+ -+/* Define to 1 if you have the `memmove' function. */ -+#undef HAVE_MEMMOVE -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the `memset' function. */ -+#undef HAVE_MEMSET -+ -+/* Define to 1 if you have the `mkstemp' function. */ -+#undef HAVE_MKSTEMP -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_NDBM_H -+ -+/* Define to 1 if you have the header file, and it defines `DIR'. */ -+#undef HAVE_NDIR_H -+ -+/* Define to 1 if you have the `pci_device_enable' function. */ -+#undef HAVE_PCI_DEVICE_ENABLE -+ -+/* Define to 1 if you have the `pci_device_is_boot_vga' function. */ -+#undef HAVE_PCI_DEVICE_IS_BOOT_VGA -+ -+/* Define to 1 if you have the `pci_device_vgaarb_init' function. */ -+#undef HAVE_PCI_DEVICE_VGAARB_INIT -+ -+/* Define to 1 if you have the `pci_system_init_dev_mem' function. */ -+#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_RPCSVC_DBM_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SELINUX_AVC_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SELINUX_SELINUX_H -+ -+/* Use libmd SHA1 functions instead of OpenSSL libcrypto */ -+#undef HAVE_SHA1_IN_LIBMD -+ -+/* Define to 1 if you have the `shmctl64' function. */ -+#undef HAVE_SHMCTL64 -+ -+/* Define to 1 if the system has the type `socklen_t'. */ -+#undef HAVE_SOCKLEN_T -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the `strcasestr' function. */ -+#undef HAVE_STRCASESTR -+ -+/* Define to 1 if you have the `strchr' function. */ -+#undef HAVE_STRCHR -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STROPTS_H -+ -+/* Define to 1 if you have the `strrchr' function. */ -+#undef HAVE_STRRCHR -+ -+/* Define to 1 if you have the `strtol' function. */ -+#undef HAVE_STRTOL -+ -+/* Define to 1 if SYSV IPC is available */ -+#undef HAVE_SYSV_IPC -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_AGPGART_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_AGPIO_H -+ -+/* Define to 1 if you have the header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_DIR_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_IO_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_KD_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_LINKER_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_MEMRANGE_H -+ -+/* Define to 1 if you have the header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_NDIR_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_VM86_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_VT_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to 1 if you have the `vprintf' function. */ -+#undef HAVE_VPRINTF -+ -+/* Define to 1 if you have the `vsnprintf' function. */ -+#undef HAVE_VSNPRINTF -+ -+/* Define to 1 if you have the `walkcontext' function. */ -+#undef HAVE_WALKCONTEXT -+ -+/* Support IPv6 for TCP connections */ -+#undef IPv6 -+ -+/* Build kdrive ddx */ -+#undef KDRIVEDDXACTIONS -+ -+/* Build fbdev-based kdrive server */ -+#undef KDRIVEFBDEV -+ -+/* Build Kdrive X server */ -+#undef KDRIVESERVER -+ -+/* Build VESA-based kdrive servers */ -+#undef KDRIVEVESA -+ -+/* Prefix to use for launchd identifiers */ -+#undef LAUNCHD_ID_PREFIX -+ -+/* Support os-specific local connections */ -+#undef LOCALCONN -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Support MIT-SHM extension */ -+#undef MITSHM -+ -+/* Have monotonic clock from clock_gettime() */ -+#undef MONOTONIC_CLOCK -+ -+/* Build Multibuffer extension */ -+#undef MULTIBUFFER -+ -+/* Do not have 'strcasecmp'. */ -+#undef NEED_STRCASECMP -+ -+/* Do not have 'strcasestr'. */ -+#undef NEED_STRCASESTR -+ -+/* Do not have 'strncasecmp'. */ -+#undef NEED_STRNCASECMP -+ -+/* Need XFree86 helper functions */ -+#undef NEED_XF86_PROTOTYPES -+ -+/* Need XFree86 typedefs */ -+#undef NEED_XF86_TYPES -+ -+/* Define to 1 if modules should avoid the libcwrapper */ -+#undef NO_LIBCWRAPPER -+ -+/* Use an empty root cursor */ -+#undef NULL_ROOT_CURSOR -+ -+/* Operating System Name */ -+#undef OSNAME -+ -+/* Operating System Vendor */ -+#undef OSVENDOR -+ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Internal define for Xinerama */ -+#undef PANORAMIX -+ -+/* System has PC console */ -+#undef PCCONS_SUPPORT -+ -+/* Default PCI text file ID path */ -+#undef PCI_TXT_IDS_PATH -+ -+/* System has PC console */ -+#undef PCVT_SUPPORT -+ -+/* Overall prefix */ -+#undef PROJECTROOT -+ -+/* Support RANDR extension */ -+#undef RANDR -+ -+/* Make PROJECT_ROOT relative to the xserver location */ -+#undef RELOCATE_PROJECTROOT -+ -+/* Support RENDER extension */ -+#undef RENDER -+ -+/* Support X resource extension */ -+#undef RES -+ -+/* Define as the return type of signal handlers (`int' or `void'). */ -+#undef RETSIGTYPE -+ -+/* Build Rootless code */ -+#undef ROOTLESS -+ -+/* Support MIT-SCREEN-SAVER extension */ -+#undef SCREENSAVER -+ -+/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ -+#undef SECURE_RPC -+ -+/* Server miscellaneous config path */ -+#undef SERVER_MISC_CONFIG_PATH -+ -+/* Support SHAPE extension */ -+#undef SHAPE -+ -+/* The size of `unsigned long', as computed by sizeof. */ -+#undef SIZEOF_UNSIGNED_LONG -+ -+/* If using the C implementation of alloca, define if you know the -+ direction of stack growth for your system; otherwise it will be -+ automatically deduced at runtime. -+ STACK_DIRECTION > 0 => grows toward higher addresses -+ STACK_DIRECTION < 0 => grows toward lower addresses -+ STACK_DIRECTION = 0 => direction of growth unknown */ -+#undef STACK_DIRECTION -+ -+/* Build a standalone xpbproxy */ -+#undef STANDALONE_XPBPROXY -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define to 1 on systems derived from System V Release 4 */ -+#undef SVR4 -+ -+/* System has syscons console */ -+#undef SYSCONS_SUPPORT -+ -+/* Support TCP socket connections */ -+#undef TCPCONN -+ -+/* Have tslib support */ -+#undef TSLIB -+ -+/* Enable unit tests */ -+#undef UNITTESTS -+ -+/* Support UNIX socket connections */ -+#undef UNIXCONN -+ -+/* NetBSD PIO alpha IO */ -+#undef USE_ALPHA_PIO -+ -+/* BSD AMD64 iopl */ -+#undef USE_AMD64_IOPL -+ -+/* BSD /dev/io */ -+#undef USE_DEV_IO -+ -+/* BSD i386 iopl */ -+#undef USE_I386_IOPL -+ -+/* Use SIGIO handlers for input device events by default */ -+#undef USE_SIGIO_BY_DEFAULT -+ -+/* Define to use byteswap macros from */ -+#undef USE_SYS_ENDIAN_H -+ -+/* Vendor man version */ -+#undef VENDOR_MAN_VERSION -+ -+/* Vendor name */ -+#undef VENDOR_NAME -+ -+/* Vendor name */ -+#undef VENDOR_NAME_SHORT -+ -+/* Vendor release */ -+#undef VENDOR_RELEASE -+ -+/* Version number of package */ -+#undef VERSION -+ -+/* Building vgahw module */ -+#undef WITH_VGAHW -+ -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+# undef WORDS_BIGENDIAN -+# endif -+#endif -+ -+/* System has wscons console */ -+#undef WSCONS_SUPPORT -+ -+/* Build X-ACE extension */ -+#undef XACE -+ -+/* Build XCalibrate extension */ -+#undef XCALIBRATE -+ -+/* Support XCMisc extension */ -+#undef XCMISC -+ -+/* Build Security extension */ -+#undef XCSECURITY -+ -+/* Support XDM Control Protocol */ -+#undef XDMCP -+ -+/* Support XF86 Big font extension */ -+#undef XF86BIGFONT -+ -+/* Name of configuration file */ -+#undef XF86CONFIGFILE -+ -+/* Build DRI extension */ -+#undef XF86DRI -+ -+/* Support XFree86 Video Mode extension */ -+#undef XF86VIDMODE -+ -+/* Support XFixes extension */ -+#undef XFIXES -+ -+/* Building loadable XFree86 server */ -+#undef XFree86LOADER -+ -+/* Building XFree86 server */ -+#undef XFree86Server -+ -+/* Build XDGA support */ -+#undef XFreeXDGA -+ -+/* Support Xinerama extension */ -+#undef XINERAMA -+ -+/* Path to XKB data */ -+#undef XKB_BASE_DIRECTORY -+ -+/* Path to XKB bin dir */ -+#undef XKB_BIN_DIRECTORY -+ -+/* Default XKB layout */ -+#undef XKB_DFLT_LAYOUT -+ -+/* Default XKB model */ -+#undef XKB_DFLT_MODEL -+ -+/* Default XKB options */ -+#undef XKB_DFLT_OPTIONS -+ -+/* Default XKB ruleset */ -+#undef XKB_DFLT_RULES -+ -+/* Default XKB variant */ -+#undef XKB_DFLT_VARIANT -+ -+/* Path to XKB output dir */ -+#undef XKM_OUTPUT_DIR -+ -+/* Building Xorg server */ -+#undef XORGSERVER -+ -+/* Vendor release */ -+#undef XORG_DATE -+ -+/* Vendor man version */ -+#undef XORG_MAN_VERSION -+ -+/* Building Xorg server */ -+#undef XORG_SERVER -+ -+/* Current Xorg version */ -+#undef XORG_VERSION_CURRENT -+ -+/* Have Quartz */ -+#undef XQUARTZ -+ -+/* Support application updating through sparkle. */ -+#undef XQUARTZ_SPARKLE -+ -+/* Support Record extension */ -+#undef XRECORD -+ -+/* Build registry module */ -+#undef XREGISTRY -+ -+/* Build SELinux extension */ -+#undef XSELINUX -+ -+/* Define to 1 if the DTrace Xserver provider probes should be built in. */ -+#undef XSERVER_DTRACE -+ -+/* Use libpciaccess for all pci manipulation */ -+#undef XSERVER_LIBPCIACCESS -+ -+/* Support XSync extension */ -+#undef XSYNC -+ -+/* Support XTest extension */ -+#undef XTEST -+ -+/* Support Xv extension */ -+#undef XV -+ -+/* Vendor name */ -+#undef XVENDORNAME -+ -+/* Short vendor name */ -+#undef XVENDORNAMESHORT -+ -+/* Build Xv extension */ -+#undef XvExtension -+ -+/* Build XvMC extension */ -+#undef XvMCExtension -+ -+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a -+ `char[]'. */ -+#undef YYTEXT_POINTER -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Enable GNU and other extensions to the C environment for glibc */ -+#undef _GNU_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to 1 if unsigned long is 64 bits. */ -+#undef _XSERVER64 -+ -+/* Vendor web address for support */ -+#undef __VENDORDWEBSUPPORT__ -+ -+/* Name of configuration file */ -+#undef __XCONFIGFILE__ -+ -+/* Name of X server */ -+#undef __XSERVERNAME__ -+ -+/* Define to 16-bit byteswap macro */ -+#undef bswap_16 -+ -+/* Define to 32-bit byteswap macro */ -+#undef bswap_32 -+ -+/* Define to 64-bit byteswap macro */ -+#undef bswap_64 -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `int' if does not define. */ -+#undef pid_t -diff -Naur xorg-server-1.7.99.1/include/Makefile.in xorg-server-1.7.99.1.patch/include/Makefile.in ---- xorg-server-1.7.99.1/include/Makefile.in 2009-10-21 18:07:20.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/include/Makefile.in 2009-11-15 21:04:08.725356051 +0100 -@@ -241,7 +241,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -263,6 +262,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/Makefile.in xorg-server-1.7.99.1.patch/Makefile.in ---- xorg-server-1.7.99.1/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/Makefile.in 2009-11-15 21:04:11.562356781 +0100 -@@ -282,7 +282,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -304,6 +303,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/mi/Makefile.in xorg-server-1.7.99.1.patch/mi/Makefile.in ---- xorg-server-1.7.99.1/mi/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/mi/Makefile.in 2009-11-15 21:04:08.905356508 +0100 -@@ -266,7 +266,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -288,6 +287,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/miext/cw/Makefile.in xorg-server-1.7.99.1.patch/miext/cw/Makefile.in ---- xorg-server-1.7.99.1/miext/cw/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/miext/cw/Makefile.in 2009-11-15 21:04:09.233356027 +0100 -@@ -230,7 +230,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -252,6 +251,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/miext/damage/Makefile.in xorg-server-1.7.99.1.patch/miext/damage/Makefile.in ---- xorg-server-1.7.99.1/miext/damage/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/miext/damage/Makefile.in 2009-11-15 21:04:09.401356728 +0100 -@@ -256,7 +256,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -278,6 +277,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/miext/Makefile.in xorg-server-1.7.99.1.patch/miext/Makefile.in ---- xorg-server-1.7.99.1/miext/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/miext/Makefile.in 2009-11-15 21:04:09.066357568 +0100 -@@ -246,7 +246,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -268,6 +267,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/miext/rootless/Makefile.in xorg-server-1.7.99.1.patch/miext/rootless/Makefile.in ---- xorg-server-1.7.99.1/miext/rootless/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/miext/rootless/Makefile.in 2009-11-15 21:04:09.563359823 +0100 -@@ -231,7 +231,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -253,6 +252,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/miext/shadow/Makefile.in xorg-server-1.7.99.1.patch/miext/shadow/Makefile.in ---- xorg-server-1.7.99.1/miext/shadow/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/miext/shadow/Makefile.in 2009-11-15 21:04:09.737356457 +0100 -@@ -261,7 +261,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -283,6 +282,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/os/Makefile.in xorg-server-1.7.99.1.patch/os/Makefile.in ---- xorg-server-1.7.99.1/os/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/os/Makefile.in 2009-11-15 21:04:09.927356235 +0100 -@@ -254,7 +254,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -276,6 +275,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/randr/Makefile.in xorg-server-1.7.99.1.patch/randr/Makefile.in ---- xorg-server-1.7.99.1/randr/Makefile.in 2009-10-21 18:07:21.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/randr/Makefile.in 2009-11-15 21:04:10.131356133 +0100 -@@ -265,7 +265,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -287,6 +286,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/record/Makefile.in xorg-server-1.7.99.1.patch/record/Makefile.in ---- xorg-server-1.7.99.1/record/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/record/Makefile.in 2009-11-15 21:04:10.286357001 +0100 -@@ -230,7 +230,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -252,6 +251,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/render/Makefile.in xorg-server-1.7.99.1.patch/render/Makefile.in ---- xorg-server-1.7.99.1/render/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/render/Makefile.in 2009-11-15 21:04:10.453357344 +0100 -@@ -259,7 +259,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -281,6 +280,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/test/Makefile.in xorg-server-1.7.99.1.patch/test/Makefile.in ---- xorg-server-1.7.99.1/test/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/test/Makefile.in 2009-11-15 21:04:10.704356048 +0100 -@@ -301,7 +301,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -323,6 +322,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/test/xi2/Makefile.in xorg-server-1.7.99.1.patch/test/xi2/Makefile.in ---- xorg-server-1.7.99.1/test/xi2/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/test/xi2/Makefile.in 2009-11-15 21:04:11.050356143 +0100 -@@ -368,7 +368,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -390,6 +389,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/Xext/Makefile.in xorg-server-1.7.99.1.patch/Xext/Makefile.in ---- xorg-server-1.7.99.1/Xext/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/Xext/Makefile.in 2009-11-15 21:03:55.063356117 +0100 -@@ -331,7 +331,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -353,6 +352,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/xfixes/Makefile.in xorg-server-1.7.99.1.patch/xfixes/Makefile.in ---- xorg-server-1.7.99.1/xfixes/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xfixes/Makefile.in 2009-11-15 21:04:11.215355771 +0100 -@@ -257,7 +257,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -279,6 +278,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/Xi/Makefile.in xorg-server-1.7.99.1.patch/Xi/Makefile.in ---- xorg-server-1.7.99.1/Xi/Makefile.in 2009-10-21 18:07:08.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/Xi/Makefile.in 2009-11-15 21:03:55.230356461 +0100 -@@ -241,7 +241,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -263,6 +262,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ -diff -Naur xorg-server-1.7.99.1/xkb/Makefile.in xorg-server-1.7.99.1.patch/xkb/Makefile.in ---- xorg-server-1.7.99.1/xkb/Makefile.in 2009-10-21 18:07:22.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/Makefile.in 2009-11-15 21:04:11.398355837 +0100 -@@ -266,7 +266,6 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ -@@ -288,6 +287,8 @@ - STRIP = @STRIP@ - TSLIB_CFLAGS = @TSLIB_CFLAGS@ - TSLIB_LIBS = @TSLIB_LIBS@ -+UDEV_CFLAGS = @UDEV_CFLAGS@ -+UDEV_LIBS = @UDEV_LIBS@ - UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ - VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ - VERSION = @VERSION@ diff --git a/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.2-add_udev_support-0.5.diff b/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.2-add_udev_support-0.5.diff new file mode 100644 index 0000000000..2e2344c16c --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.2-add_udev_support-0.5.diff @@ -0,0 +1,2880 @@ +diff -Naur xorg-server-20091215/composite/Makefile.in xorg-server-20091215.patch/composite/Makefile.in +--- xorg-server-20091215/composite/Makefile.in 2009-12-15 20:10:05.000000000 +0100 ++++ xorg-server-20091215.patch/composite/Makefile.in 2009-12-15 23:04:50.392321137 +0100 +@@ -290,6 +290,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/config/config-backends.h xorg-server-20091215.patch/config/config-backends.h +--- xorg-server-20091215/config/config-backends.h 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/config/config-backends.h 2009-12-15 23:04:05.471323673 +0100 +@@ -26,8 +26,18 @@ + #ifdef HAVE_DIX_CONFIG_H + #include + #endif ++#include "input.h" + +-#ifdef CONFIG_NEED_DBUS ++void remove_devices(const char *backend, const char *config_info); ++BOOL device_is_duplicate(const char *config_info); ++void add_option(InputOption **options, const char *key, const char *value); ++ ++#ifdef CONFIG_UDEV ++int config_udev_init(void); ++void config_udev_fini(void); ++#else ++ ++# ifdef CONFIG_NEED_DBUS + #include + + typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, +@@ -46,14 +56,15 @@ + void config_dbus_core_fini(void); + int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); + void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); +-#endif ++# endif + +-#ifdef CONFIG_DBUS_API ++# ifdef CONFIG_DBUS_API + int config_dbus_init(void); + void config_dbus_fini(void); +-#endif ++# endif + +-#ifdef CONFIG_HAL ++# ifdef CONFIG_HAL + int config_hal_init(void); + void config_hal_fini(void); ++# endif + #endif +diff -Naur xorg-server-20091215/config/config.c xorg-server-20091215.patch/config/config.c +--- xorg-server-20091215/config/config.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/config/config.c 2009-12-15 23:04:05.472323723 +0100 +@@ -28,13 +28,17 @@ + #endif + + #include "os.h" ++#include "inputstr.h" + #include "hotplug.h" + #include "config-backends.h" + + void + config_init(void) + { +-#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) ++#ifdef CONFIG_UDEV ++ if (!config_udev_init()) ++ ErrorF("[config] failed to initialise udev\n"); ++#elif defined(CONFIG_NEED_DBUS) + if (config_dbus_core_init()) { + # ifdef CONFIG_DBUS_API + if (!config_dbus_init()) +@@ -54,7 +58,9 @@ + void + config_fini(void) + { +-#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) ++#if defined(CONFIG_UDEV) ++ config_udev_fini(); ++#elif defined(CONFIG_NEED_DBUS) + # ifdef CONFIG_HAL + config_hal_fini(); + # endif +@@ -64,3 +70,70 @@ + config_dbus_core_fini(); + #endif + } ++ ++static void ++remove_device(const char *backend, DeviceIntPtr dev) ++{ ++ /* this only gets called for devices that have already been added */ ++ LogMessage(X_INFO, "config/%s: removing device %s\n", backend, dev->name); ++ ++ /* Call PIE here so we don't try to dereference a device that's ++ * already been removed. */ ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++void ++remove_devices(const char *backend, const char *config_info) ++{ ++ DeviceIntPtr dev, next; ++ ++ for (dev = inputInfo.devices; dev; dev = next) { ++ next = dev->next; ++ if (dev->config_info && strcmp(dev->config_info, config_info) == 0) ++ remove_device(backend, dev); ++ } ++ for (dev = inputInfo.off_devices; dev; dev = next) { ++ next = dev->next; ++ if (dev->config_info && strcmp(dev->config_info, config_info) == 0) ++ remove_device(backend, dev); ++ } ++} ++ ++BOOL ++device_is_duplicate(const char *config_info) ++{ ++ DeviceIntPtr dev; ++ ++ for (dev = inputInfo.devices; dev; dev = dev->next) ++ { ++ if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) ++ return TRUE; ++ } ++ ++ for (dev = inputInfo.off_devices; dev; dev = dev->next) ++ { ++ if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value == '\0') ++ return; ++ ++ for (; *options; options = &(*options)->next) ++ ; ++ *options = xcalloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key = xstrdup(key); ++ (*options)->value = xstrdup(value); ++ (*options)->next = NULL; ++} +diff -Naur xorg-server-20091215/config/hal.c xorg-server-20091215.patch/config/hal.c +--- xorg-server-20091215/config/hal.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/config/hal.c 2009-12-15 23:04:05.472323723 +0100 +@@ -58,25 +58,9 @@ + char* options; + }; + +- +-static void +-remove_device(DeviceIntPtr dev) +-{ +- /* this only gets called for devices that have already been added */ +- LogMessage(X_INFO, "config/hal: removing device %s\n", dev->name); +- +- /* Call PIE here so we don't try to dereference a device that's +- * already been removed. */ +- OsBlockSignals(); +- ProcessInputEvents(); +- DeleteInputDeviceRequest(dev); +- OsReleaseSignals(); +-} +- + static void + device_removed(LibHalContext *ctx, const char *udi) + { +- DeviceIntPtr dev, next; + char *value; + + value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */ +@@ -84,36 +68,11 @@ + return; + sprintf(value, "hal:%s", udi); + +- for (dev = inputInfo.devices; dev; dev = next) { +- next = dev->next; +- if (dev->config_info && strcmp(dev->config_info, value) == 0) +- remove_device(dev); +- } +- for (dev = inputInfo.off_devices; dev; dev = next) { +- next = dev->next; +- if (dev->config_info && strcmp(dev->config_info, value) == 0) +- remove_device(dev); +- } ++ remove_devices("hal", value); + + xfree(value); + } + +-static void +-add_option(InputOption **options, const char *key, const char *value) +-{ +- if (!value || *value == '\0') +- return; +- +- for (; *options; options = &(*options)->next) +- ; +- *options = xcalloc(sizeof(**options), 1); +- if (!*options) /* Yeesh. */ +- return; +- (*options)->key = xstrdup(key); +- (*options)->value = xstrdup(value); +- (*options)->next = NULL; +-} +- + static char * + get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name) + { +@@ -166,26 +125,6 @@ + return ret; + } + +-static BOOL +-device_is_duplicate(char *config_info) +-{ +- DeviceIntPtr dev; +- +- for (dev = inputInfo.devices; dev; dev = dev->next) +- { +- if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) +- return TRUE; +- } +- +- for (dev = inputInfo.off_devices; dev; dev = dev->next) +- { +- if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) +- return TRUE; +- } +- +- return FALSE; +-} +- + static void + device_added(LibHalContext *hal_ctx, const char *udi) + { +diff -Naur xorg-server-20091215/config/Makefile.am xorg-server-20091215.patch/config/Makefile.am +--- xorg-server-20091215/config/Makefile.am 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/config/Makefile.am 2009-12-15 23:04:05.470323484 +0100 +@@ -3,10 +3,18 @@ + noinst_LTLIBRARIES = libconfig.la + libconfig_la_SOURCES = config.c config-backends.h + ++if CONFIG_UDEV ++ ++AM_CFLAGS += @UDEV_CFLAGS@ ++libconfig_la_SOURCES += udev.c ++libconfig_la_LIBADD = @UDEV_LIBS@ ++ ++else ++ + if CONFIG_NEED_DBUS + AM_CFLAGS += @DBUS_CFLAGS@ + libconfig_la_SOURCES += dbus-core.c +-endif ++libconfig_la_LIBADD = @DBUS_LIBS@ + + if CONFIG_DBUS_API + dbusconfigdir = $(sysconfdir)/dbus-1/system.d +@@ -16,7 +24,13 @@ + endif + + if CONFIG_HAL ++AM_CFLAGS += @HAL_CFLAGS@ + libconfig_la_SOURCES += hal.c ++libconfig_la_LIBADD += @HAL_LIBS@ + endif + ++endif # CONFIG_NEED_DBUS ++ ++endif # !CONFIG_UDEV ++ + EXTRA_DIST = xorg-server.conf x11-input.fdi +diff -Naur xorg-server-20091215/config/Makefile.in xorg-server-20091215.patch/config/Makefile.in +--- xorg-server-20091215/config/Makefile.in 2009-12-15 20:10:06.000000000 +0100 ++++ xorg-server-20091215.patch/config/Makefile.in 2009-12-15 23:04:50.575321129 +0100 +@@ -35,10 +35,14 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@CONFIG_NEED_DBUS_TRUE@am__append_1 = @DBUS_CFLAGS@ +-@CONFIG_NEED_DBUS_TRUE@am__append_2 = dbus-core.c +-@CONFIG_DBUS_API_TRUE@am__append_3 = dbus.c +-@CONFIG_HAL_TRUE@am__append_4 = hal.c ++@CONFIG_UDEV_TRUE@am__append_1 = @UDEV_CFLAGS@ ++@CONFIG_UDEV_TRUE@am__append_2 = udev.c ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_3 = @DBUS_CFLAGS@ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_4 = dbus-core.c ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_5 = dbus.c ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_6 = @HAL_CFLAGS@ ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_7 = hal.c ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_8 = @HAL_LIBS@ + subdir = config + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -61,14 +65,18 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libconfig_la_LIBADD = +-am__libconfig_la_SOURCES_DIST = config.c config-backends.h dbus-core.c \ +- dbus.c hal.c +-@CONFIG_NEED_DBUS_TRUE@am__objects_1 = dbus-core.lo +-@CONFIG_DBUS_API_TRUE@am__objects_2 = dbus.lo +-@CONFIG_HAL_TRUE@am__objects_3 = hal.lo ++am__DEPENDENCIES_1 = ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@CONFIG_UDEV_TRUE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++am__libconfig_la_SOURCES_DIST = config.c config-backends.h udev.c \ ++ dbus-core.c dbus.c hal.c ++@CONFIG_UDEV_TRUE@am__objects_1 = udev.lo ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_2 = \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ dbus-core.lo ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_3 = dbus.lo ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_4 = hal.lo + am_libconfig_la_OBJECTS = config.lo $(am__objects_1) $(am__objects_2) \ +- $(am__objects_3) ++ $(am__objects_3) $(am__objects_4) + libconfig_la_OBJECTS = $(am_libconfig_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -297,6 +305,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +@@ -420,12 +430,17 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) ++AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) $(am__append_3) \ ++ $(am__append_6) + noinst_LTLIBRARIES = libconfig.la + libconfig_la_SOURCES = config.c config-backends.h $(am__append_2) \ +- $(am__append_3) $(am__append_4) +-@CONFIG_DBUS_API_TRUE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d +-@CONFIG_DBUS_API_TRUE@dbusconfig_DATA = xorg-server.conf ++ $(am__append_4) $(am__append_5) $(am__append_7) ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_LIBADD = \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ @DBUS_LIBS@ \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ $(am__append_8) ++@CONFIG_UDEV_TRUE@libconfig_la_LIBADD = @UDEV_LIBS@ $(am__append_8) ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfig_DATA = xorg-server.conf + EXTRA_DIST = xorg-server.conf x11-input.fdi + all: all-am + +@@ -483,6 +498,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-core.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hal.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udev.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -Naur xorg-server-20091215/config/udev.c xorg-server-20091215.patch/config/udev.c +--- xorg-server-20091215/config/udev.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-20091215.patch/config/udev.c 2009-12-15 23:04:05.473321747 +0100 +@@ -0,0 +1,245 @@ ++/* ++ * Copyright © 2009 Julien Cristau ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Julien Cristau ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define UDEV_XKB_PROP_KEY "xkb" ++#define UDEV_PROP_KEY "x11_options." ++ ++static struct udev_monitor *udev_monitor; ++ ++static void ++device_added(struct udev_device *udev_device) ++{ ++ const char *path = NULL, *driver = NULL, *name = NULL; ++ char *config_info = NULL; ++ const char *syspath; ++ const char *key, *value, *tmp; ++ InputOption *options = NULL, *tmpo; ++ DeviceIntPtr dev = NULL; ++ struct udev_list_entry *set, *entry; ++ struct udev_device *parent; ++ int rc; ++ ++ driver = udev_device_get_property_value(udev_device, "x11_driver"); ++ ++ path = udev_device_get_devnode(udev_device); ++ ++ syspath = udev_device_get_syspath(udev_device); ++ ++ parent = udev_device_get_parent(udev_device); ++ if (parent) ++ name = udev_device_get_property_value(parent, "NAME"); ++ else ++ name = "(unnamed)"; ++ ++ if (!driver || !path || !syspath) ++ return; ++ options = xcalloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ options->key = xstrdup("_source"); ++ options->value = xstrdup("server/udev"); ++ if (!options->key || !options->value) ++ goto unwind; ++ ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++ add_option(&options, "driver", driver); ++ ++ config_info = Xprintf("udev:%s", syspath); ++ if (!config_info) ++ goto unwind; ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/udev: device %s already added. " ++ "Ignoring.\n", name); ++ goto unwind; ++ } ++ ++ set = udev_device_get_properties_list_entry(udev_device); ++ udev_list_entry_foreach(entry, set) { ++ key = udev_list_entry_get_name(entry); ++ if (!key) ++ continue; ++ if (!strncasecmp(key, UDEV_PROP_KEY, sizeof(UDEV_PROP_KEY) - 1)) { ++ value = udev_list_entry_get_value(entry); ++ add_option(&options, key + sizeof(UDEV_PROP_KEY) - 1, value); ++ } else if (!strncasecmp(key, UDEV_XKB_PROP_KEY, ++ sizeof(UDEV_XKB_PROP_KEY) - 1)) { ++ tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1; ++ value = udev_list_entry_get_value(entry); ++ if (!strcasecmp(tmp, "rules")) ++ add_option(&options, "xkb_rules", value); ++ else if (!strcasecmp(tmp, "layout")) ++ add_option(&options, "xkb_layout", value); ++ else if (!strcasecmp(tmp, "variant")) ++ add_option(&options, "xkb_variant", value); ++ else if (!strcasecmp(tmp, "model")) ++ add_option(&options, "xkb_model", value); ++ else if (!strcasecmp(tmp, "options")) ++ add_option(&options, "xkb_options", value); ++ } ++ } ++ add_option(&options, "name", name); ++ LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n", ++ name, path); ++ rc = NewInputDeviceRequest(options, &dev); ++ if (rc != Success) ++ goto unwind; ++ ++ for (; dev; dev = dev->next) { ++ xfree(dev->config_info); ++ dev->config_info = xstrdup(config_info); ++ } ++ ++ unwind: ++ xfree(config_info); ++ while (!dev && (tmpo = options)) { ++ options = tmpo->next; ++ xfree(tmpo->key); ++ xfree(tmpo->value); ++ xfree(tmpo); ++ } ++ ++ return; ++} ++ ++static void ++device_removed(struct udev_device *device) ++{ ++ char *value; ++ const char *syspath = udev_device_get_syspath(device); ++ ++ value = Xprintf("udev:%s", syspath); ++ if (!value) ++ return; ++ ++ remove_devices("udev", value); ++ ++ xfree(value); ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ int udev_fd = udev_monitor_get_fd(udev_monitor); ++ struct udev_device *udev_device; ++ const char *action; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(udev_fd, (fd_set *)read_mask)) { ++ udev_device = udev_monitor_receive_device(udev_monitor); ++ if (!udev_device) ++ return; ++ action = udev_device_get_action(udev_device); ++ if (!action) ++ ; ++ else if (!strcmp(action, "add")) ++ device_added(udev_device); ++ else if (!strcmp(action, "remove")) ++ device_removed(udev_device); ++ udev_device_unref(udev_device); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++int ++config_udev_init(void) ++{ ++ struct udev *udev; ++ struct udev_enumerate *enumerate; ++ struct udev_list_entry *devices, *device; ++ int rc; ++ ++ udev = udev_new(); ++ if (!udev) ++ return 0; ++ udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); ++ if (!udev_monitor) ++ return 0; ++ rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, ++ "input", NULL); ++ if (rc < 0) ++ return 0; ++ ++ if (udev_monitor_enable_receiving(udev_monitor)) { ++ ErrorF("config/udev: failed to bind the udev monitor\n"); ++ return 0; ++ } ++ ++ enumerate = udev_enumerate_new(udev); ++ if (!enumerate) ++ return 0; ++ udev_enumerate_add_match_subsystem(enumerate, "input"); ++ udev_enumerate_scan_devices(enumerate); ++ devices = udev_enumerate_get_list_entry(enumerate); ++ udev_list_entry_foreach(device, devices) { ++ const char *syspath = udev_list_entry_get_name(device); ++ struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath); ++ device_added(udev_device); ++ udev_device_unref(udev_device); ++ } ++ udev_enumerate_unref(enumerate); ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ AddGeneralSocket(udev_monitor_get_fd(udev_monitor)); ++ ++ return 1; ++} ++ ++void ++config_udev_fini(void) ++{ ++ struct udev *udev; ++ ++ if (!udev_monitor) ++ return; ++ ++ udev = udev_monitor_get_udev(udev_monitor); ++ ++ RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor)); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor); ++ udev_monitor_unref(udev_monitor); ++ udev_monitor = NULL; ++ udev_unref(udev); ++} +diff -Naur xorg-server-20091215/config/x11-input.rules xorg-server-20091215.patch/config/x11-input.rules +--- xorg-server-20091215/config/x11-input.rules 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-20091215.patch/config/x11-input.rules 2009-12-15 23:04:05.473321747 +0100 +@@ -0,0 +1,14 @@ ++SUBSYSTEM!="input", GOTO="x11_input_end" ++ACTION!="change|add", GOTO="x11_input_end" ++KERNEL!="event*", GOTO="x11_input_end" ++ ++# use the evdev driver by default ++ENV{x11_driver}="evdev" ++ ++# set xkb layout if we have keys ++ENV{ID_INPUT_KEY}=="?*", ENV{xkblayout}="us" ++ ++# use synaptics for touchpads ++ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="synaptics" ++ ++LABEL="x11_input_end" +diff -Naur xorg-server-20091215/config.log xorg-server-20091215.patch/config.log +diff -Naur xorg-server-20091215/configure xorg-server-20091215.patch/configure +--- xorg-server-20091215/configure 2009-12-15 20:09:57.000000000 +0100 ++++ xorg-server-20091215.patch/configure 2009-12-15 23:04:43.971321371 +0100 +@@ -1067,6 +1067,10 @@ + HAVE_DBUS_TRUE + DBUS_LIBS + DBUS_CFLAGS ++CONFIG_UDEV_FALSE ++CONFIG_UDEV_TRUE ++UDEV_LIBS ++UDEV_CFLAGS + INSTALL_LIBXF86CONFIG_FALSE + INSTALL_LIBXF86CONFIG_TRUE + MAKE_HTML +@@ -1360,6 +1364,7 @@ + enable_dbe + enable_xf86bigfont + enable_dpms ++enable_config_udev + enable_config_dbus + enable_config_hal + enable_xfree86_utils +@@ -1401,6 +1406,8 @@ + PKG_CONFIG + YACC + YFLAGS ++UDEV_CFLAGS ++UDEV_LIBS + DBUS_CFLAGS + DBUS_LIBS + HAL_CFLAGS +@@ -2148,6 +2155,7 @@ + --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: 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) +@@ -2266,6 +2274,8 @@ + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a + default value of `-d' given by some make applications. ++ UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config ++ UDEV_LIBS linker flags for UDEV, overriding pkg-config + DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config + DBUS_LIBS linker flags for DBUS, overriding pkg-config + HAL_CFLAGS C compiler flags for HAL, overriding pkg-config +@@ -7652,13 +7662,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:7655: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:7665: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7658: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:7668: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7661: output\"" >&5) ++ (eval echo "\"\$as_me:7671: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -8849,7 +8859,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8852 "configure"' > conftest.$ac_ext ++ echo '#line 8862 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10186,11 +10196,11 @@ + -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:10189: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10199: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10193: \$? = $ac_status" >&5 ++ echo "$as_me:10203: \$? = $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. +@@ -10525,11 +10535,11 @@ + -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:10528: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10538: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10532: \$? = $ac_status" >&5 ++ echo "$as_me:10542: \$? = $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. +@@ -10630,11 +10640,11 @@ + -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:10633: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10643: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10637: \$? = $ac_status" >&5 ++ echo "$as_me:10647: \$? = $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 +@@ -10685,11 +10695,11 @@ + -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:10688: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10698: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10692: \$? = $ac_status" >&5 ++ echo "$as_me:10702: \$? = $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 +@@ -13488,7 +13498,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13491 "configure" ++#line 13501 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13584,7 +13594,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13587 "configure" ++#line 13597 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -21481,6 +21491,13 @@ + DPMSExtension=yes + fi + ++# Check whether --enable-config-udev was given. ++if test "${enable_config_udev+set}" = set; then ++ enableval=$enable_config_udev; CONFIG_UDEV=$enableval ++else ++ CONFIG_UDEV=auto ++fi ++ + # Check whether --enable-config-dbus was given. + if test "${enable_config_dbus+set}" = set; then + enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval +@@ -22997,6 +23014,107 @@ + LIBXTST="xtst >= 1.0.99.2" + LIBPCIACCESS="pciaccess >= 0.8.0" + LIBGLIB="glib-2.0 >= 2.16" ++LIBUDEV="libudev >= 143" ++ ++if test "x$CONFIG_UDEV" = xyes && ++ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then ++ { { $as_echo "$as_me:$LINENO: error: Hotplugging through both libudev and dbus/hal not allowed" >&5 ++$as_echo "$as_me: error: Hotplugging through both libudev and dbus/hal not allowed" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5 ++$as_echo_n "checking for UDEV... " >&6; } ++ ++if test -n "$UDEV_CFLAGS"; then ++ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "$LIBUDEV" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$UDEV_LIBS"; then ++ pkg_cv_UDEV_LIBS="$UDEV_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "$LIBUDEV" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBUDEV" 2>&1` ++ else ++ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBUDEV" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$UDEV_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_LIBUDEV=no ++elif test $pkg_failed = untried; then ++ HAVE_LIBUDEV=no ++else ++ UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS ++ UDEV_LIBS=$pkg_cv_UDEV_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_LIBUDEV=yes ++fi ++if test "x$CONFIG_UDEV" = xauto; then ++ CONFIG_UDEV="$HAVE_LIBUDEV" ++fi ++ if test "x$CONFIG_UDEV" = xyes; then ++ CONFIG_UDEV_TRUE= ++ CONFIG_UDEV_FALSE='#' ++else ++ CONFIG_UDEV_TRUE='#' ++ CONFIG_UDEV_FALSE= ++fi ++ ++if test "x$CONFIG_UDEV" = xyes; then ++ CONFIG_DBUS_API=no ++ CONFIG_HAL=no ++ if ! test "x$HAVE_LIBUDEV" = xyes; then ++ { { $as_echo "$as_me:$LINENO: error: udev configuration API requested, but libudev is not installed" >&5 ++$as_echo "$as_me: error: udev configuration API requested, but libudev is not installed" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_UDEV 1 ++_ACEOF ++ ++fi + + + pkg_failed=no +@@ -23189,7 +23307,6 @@ + #define CONFIG_HAL 1 + _ACEOF + +- REQUIRED_LIBS="$REQUIRED_LIBS hal" + CONFIG_NEED_DBUS="yes" + fi + if test "x$CONFIG_HAL" = xyes; then +@@ -23202,7 +23319,6 @@ + + + if test "x$CONFIG_NEED_DBUS" = xyes; then +- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" + + cat >>confdefs.h <<\_ACEOF + #define CONFIG_NEED_DBUS 1 +@@ -32411,6 +32527,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${CONFIG_UDEV_TRUE}" && test -z "${CONFIG_UDEV_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_UDEV\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"CONFIG_UDEV\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +diff -Naur xorg-server-20091215/configure.ac xorg-server-20091215.patch/configure.ac +--- xorg-server-20091215/configure.ac 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/configure.ac 2009-12-15 23:04:05.474321448 +0100 +@@ -615,6 +615,7 @@ + AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) ++AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) + AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) + AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) +@@ -772,6 +773,26 @@ + LIBXTST="xtst >= 1.0.99.2" + LIBPCIACCESS="pciaccess >= 0.8.0" + LIBGLIB="glib-2.0 >= 2.16" ++LIBUDEV="libudev >= 143" ++ ++if test "x$CONFIG_UDEV" = xyes && ++ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then ++ AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed]) ++fi ++ ++PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) ++if test "x$CONFIG_UDEV" = xauto; then ++ CONFIG_UDEV="$HAVE_LIBUDEV" ++fi ++AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes]) ++if test "x$CONFIG_UDEV" = xyes; then ++ CONFIG_DBUS_API=no ++ CONFIG_HAL=no ++ if ! test "x$HAVE_LIBUDEV" = xyes; then ++ AC_MSG_ERROR([udev configuration API requested, but libudev is not installed]) ++ fi ++ AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug]) ++fi + + dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas + dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config +@@ -805,13 +826,11 @@ + fi + + AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) +- REQUIRED_LIBS="$REQUIRED_LIBS hal" + CONFIG_NEED_DBUS="yes" + fi + AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) + + if test "x$CONFIG_NEED_DBUS" = xyes; then +- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" + AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug]) + fi + AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes]) +diff -Naur xorg-server-20091215/damageext/Makefile.in xorg-server-20091215.patch/damageext/Makefile.in +--- xorg-server-20091215/damageext/Makefile.in 2009-12-15 20:10:06.000000000 +0100 ++++ xorg-server-20091215.patch/damageext/Makefile.in 2009-12-15 23:04:50.735321449 +0100 +@@ -263,6 +263,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/dbe/Makefile.in xorg-server-20091215.patch/dbe/Makefile.in +--- xorg-server-20091215/dbe/Makefile.in 2009-12-15 20:10:06.000000000 +0100 ++++ xorg-server-20091215.patch/dbe/Makefile.in 2009-12-15 23:04:50.904321304 +0100 +@@ -289,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/dix/Makefile.in xorg-server-20091215.patch/dix/Makefile.in +--- xorg-server-20091215/dix/Makefile.in 2009-12-15 20:10:06.000000000 +0100 ++++ xorg-server-20091215.patch/dix/Makefile.in 2009-12-15 23:04:51.092321264 +0100 +@@ -303,6 +303,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/doc/Makefile.in xorg-server-20091215.patch/doc/Makefile.in +--- xorg-server-20091215/doc/Makefile.in 2009-12-15 20:10:06.000000000 +0100 ++++ xorg-server-20091215.patch/doc/Makefile.in 2009-12-15 23:04:51.242321227 +0100 +@@ -266,6 +266,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/exa/Makefile.in xorg-server-20091215.patch/exa/Makefile.in +--- xorg-server-20091215/exa/Makefile.in 2009-12-15 20:10:07.000000000 +0100 ++++ xorg-server-20091215.patch/exa/Makefile.in 2009-12-15 23:04:51.414321792 +0100 +@@ -294,6 +294,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/fb/Makefile.in xorg-server-20091215.patch/fb/Makefile.in +--- xorg-server-20091215/fb/Makefile.in 2009-12-15 20:10:07.000000000 +0100 ++++ xorg-server-20091215.patch/fb/Makefile.in 2009-12-15 23:04:51.949321561 +0100 +@@ -319,6 +319,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/glx/Makefile.in xorg-server-20091215.patch/glx/Makefile.in +--- xorg-server-20091215/glx/Makefile.in 2009-12-15 20:10:08.000000000 +0100 ++++ xorg-server-20091215.patch/glx/Makefile.in 2009-12-15 23:04:52.132321412 +0100 +@@ -283,6 +283,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/config/Makefile.in xorg-server-20091215.patch/hw/dmx/config/Makefile.in +--- xorg-server-20091215/hw/dmx/config/Makefile.in 2009-12-15 20:10:08.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/config/Makefile.in 2009-12-15 23:04:52.714321276 +0100 +@@ -325,6 +325,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/doc/Makefile.in xorg-server-20091215.patch/hw/dmx/doc/Makefile.in +--- xorg-server-20091215/hw/dmx/doc/Makefile.in 2009-12-15 20:10:08.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/doc/Makefile.in 2009-12-15 23:04:52.868321575 +0100 +@@ -260,6 +260,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/examples/Makefile.in xorg-server-20091215.patch/hw/dmx/examples/Makefile.in +--- xorg-server-20091215/hw/dmx/examples/Makefile.in 2009-12-15 20:10:09.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/examples/Makefile.in 2009-12-15 23:04:53.184321312 +0100 +@@ -367,6 +367,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/glxProxy/Makefile.in xorg-server-20091215.patch/hw/dmx/glxProxy/Makefile.in +--- xorg-server-20091215/hw/dmx/glxProxy/Makefile.in 2009-12-15 20:10:09.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/glxProxy/Makefile.in 2009-12-15 23:04:53.352321326 +0100 +@@ -274,6 +274,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/input/Makefile.in xorg-server-20091215.patch/hw/dmx/input/Makefile.in +--- xorg-server-20091215/hw/dmx/input/Makefile.in 2009-12-15 20:10:09.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/input/Makefile.in 2009-12-15 23:04:53.528321249 +0100 +@@ -288,6 +288,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/dmx/Makefile.in xorg-server-20091215.patch/hw/dmx/Makefile.in +--- xorg-server-20091215/hw/dmx/Makefile.in 2009-12-15 20:10:08.000000000 +0100 ++++ xorg-server-20091215.patch/hw/dmx/Makefile.in 2009-12-15 23:04:52.489321228 +0100 +@@ -352,6 +352,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/ephyr/Makefile.in xorg-server-20091215.patch/hw/kdrive/ephyr/Makefile.in +--- xorg-server-20091215/hw/kdrive/ephyr/Makefile.in 2009-12-15 20:10:10.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/ephyr/Makefile.in 2009-12-15 23:04:53.873321376 +0100 +@@ -326,6 +326,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/fake/Makefile.in xorg-server-20091215.patch/hw/kdrive/fake/Makefile.in +--- xorg-server-20091215/hw/kdrive/fake/Makefile.in 2009-12-15 20:10:10.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/fake/Makefile.in 2009-12-15 23:04:54.046321219 +0100 +@@ -272,6 +272,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/fbdev/Makefile.in xorg-server-20091215.patch/hw/kdrive/fbdev/Makefile.in +--- xorg-server-20091215/hw/kdrive/fbdev/Makefile.in 2009-12-15 20:10:10.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/fbdev/Makefile.in 2009-12-15 23:04:54.219321622 +0100 +@@ -273,6 +273,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/linux/Makefile.in xorg-server-20091215.patch/hw/kdrive/linux/Makefile.in +--- xorg-server-20091215/hw/kdrive/linux/Makefile.in 2009-12-15 20:10:10.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/linux/Makefile.in 2009-12-15 23:04:54.386321167 +0100 +@@ -268,6 +268,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/Makefile.in xorg-server-20091215.patch/hw/kdrive/Makefile.in +--- xorg-server-20091215/hw/kdrive/Makefile.in 2009-12-15 20:10:09.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/Makefile.in 2009-12-15 23:04:53.671321283 +0100 +@@ -276,6 +276,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/kdrive/src/kinput.c xorg-server-20091215.patch/hw/kdrive/src/kinput.c +--- xorg-server-20091215/hw/kdrive/src/kinput.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/src/kinput.c 2009-12-15 23:04:05.475321637 +0100 +@@ -2280,6 +2280,14 @@ + return BadValue; + } + #endif ++#ifdef CONFIG_UDEV ++ else if (strcmp(option->key, "_source") == 0 && ++ strcmp(option->value, "server/udev") == 0) ++ { ++ ErrorF("Ignoring device from udev.\n"); ++ return BadValue; ++ } ++#endif + } + + if (!ki && !pi) { +diff -Naur xorg-server-20091215/hw/kdrive/src/Makefile.in xorg-server-20091215.patch/hw/kdrive/src/Makefile.in +--- xorg-server-20091215/hw/kdrive/src/Makefile.in 2009-12-15 20:10:11.000000000 +0100 ++++ xorg-server-20091215.patch/hw/kdrive/src/Makefile.in 2009-12-15 23:04:54.571321465 +0100 +@@ -273,6 +273,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/Makefile.in xorg-server-20091215.patch/hw/Makefile.in +--- xorg-server-20091215/hw/Makefile.in 2009-12-15 20:10:08.000000000 +0100 ++++ xorg-server-20091215.patch/hw/Makefile.in 2009-12-15 23:04:52.278321315 +0100 +@@ -276,6 +276,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/vfb/Makefile.in xorg-server-20091215.patch/hw/vfb/Makefile.in +--- xorg-server-20091215/hw/vfb/Makefile.in 2009-12-15 20:10:11.000000000 +0100 ++++ xorg-server-20091215.patch/hw/vfb/Makefile.in 2009-12-15 23:04:54.787321554 +0100 +@@ -310,6 +310,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/common/Makefile.in xorg-server-20091215.patch/hw/xfree86/common/Makefile.in +--- xorg-server-20091215/hw/xfree86/common/Makefile.in 2009-12-15 20:10:11.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/common/Makefile.in 2009-12-15 23:04:55.179321354 +0100 +@@ -315,6 +315,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/common/xf86Config.c xorg-server-20091215.patch/hw/xfree86/common/xf86Config.c +--- xorg-server-20091215/hw/xfree86/common/xf86Config.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/common/xf86Config.c 2009-12-15 23:04:05.476321896 +0100 +@@ -1453,12 +1453,19 @@ + } + + if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) { +-#ifdef CONFIG_HAL +- xf86Msg(X_INFO, "The server relies on HAL to provide the list of " ++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) ++ const char *config_backend; ++#if defined(CONFIG_HAL) ++ config_backend = "HAL"; ++#else ++ config_backend = "udev"; ++#endif ++ xf86Msg(X_INFO, "The server relies on %s to provide the list of " + "input devices.\n\tIf no devices become available, " +- "reconfigure HAL or disable AutoAddDevices.\n"); ++ "reconfigure %s or disable AutoAddDevices.\n", ++ config_backend, config_backend); + #else +- xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" ++ xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); + #endif + } +diff -Naur xorg-server-20091215/hw/xfree86/common/xf86Globals.c xorg-server-20091215.patch/hw/xfree86/common/xf86Globals.c +--- xorg-server-20091215/hw/xfree86/common/xf86Globals.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/common/xf86Globals.c 2009-12-15 23:04:05.477321527 +0100 +@@ -132,7 +132,7 @@ + .kbdCustomKeycodes = FALSE, + .disableRandR = FALSE, + .randRFrom = X_DEFAULT, +-#ifdef CONFIG_HAL ++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) + .allowEmptyInput = TRUE, + .autoAddDevices = TRUE, + .autoEnableDevices = TRUE +diff -Naur xorg-server-20091215/hw/xfree86/common/xf86Xinput.c xorg-server-20091215.patch/hw/xfree86/common/xf86Xinput.c +--- xorg-server-20091215/hw/xfree86/common/xf86Xinput.c 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/common/xf86Xinput.c 2009-12-15 23:04:05.477321527 +0100 +@@ -605,9 +605,9 @@ + } + } + +- /* Right now, the only automatic config we know of is HAL. */ + if (strcmp(option->key, "_source") == 0 && +- strcmp(option->value, "server/hal") == 0) { ++ (strcmp(option->value, "server/hal") == 0 || ++ strcmp(option->value, "server/udev") == 0)) { + is_auto = 1; + if (!xf86Info.autoAddDevices) { + rval = BadMatch; +diff -Naur xorg-server-20091215/hw/xfree86/ddc/Makefile.in xorg-server-20091215.patch/hw/xfree86/ddc/Makefile.in +--- xorg-server-20091215/hw/xfree86/ddc/Makefile.in 2009-12-15 20:10:12.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/ddc/Makefile.in 2009-12-15 23:04:55.349321327 +0100 +@@ -289,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/dixmods/extmod/Makefile.in xorg-server-20091215.patch/hw/xfree86/dixmods/extmod/Makefile.in +--- xorg-server-20091215/hw/xfree86/dixmods/extmod/Makefile.in 2009-12-15 20:10:12.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/dixmods/extmod/Makefile.in 2009-12-15 23:04:55.774321505 +0100 +@@ -297,6 +297,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/dixmods/Makefile.in xorg-server-20091215.patch/hw/xfree86/dixmods/Makefile.in +--- xorg-server-20091215/hw/xfree86/dixmods/Makefile.in 2009-12-15 20:10:12.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/dixmods/Makefile.in 2009-12-15 23:04:55.596320926 +0100 +@@ -377,6 +377,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/doc/devel/Makefile.in xorg-server-20091215.patch/hw/xfree86/doc/devel/Makefile.in +--- xorg-server-20091215/hw/xfree86/doc/devel/Makefile.in 2009-12-15 20:10:13.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/doc/devel/Makefile.in 2009-12-15 23:04:56.049321162 +0100 +@@ -240,6 +240,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/doc/Makefile.in xorg-server-20091215.patch/hw/xfree86/doc/Makefile.in +--- xorg-server-20091215/hw/xfree86/doc/Makefile.in 2009-12-15 20:10:12.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/doc/Makefile.in 2009-12-15 23:04:55.916321347 +0100 +@@ -277,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/doc/man/Makefile.in xorg-server-20091215.patch/hw/xfree86/doc/man/Makefile.in +--- xorg-server-20091215/hw/xfree86/doc/man/Makefile.in 2009-12-15 20:10:13.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/doc/man/Makefile.in 2009-12-15 23:04:56.198321352 +0100 +@@ -266,6 +266,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/doc/sgml/Makefile.in xorg-server-20091215.patch/hw/xfree86/doc/sgml/Makefile.in +--- xorg-server-20091215/hw/xfree86/doc/sgml/Makefile.in 2009-12-15 20:10:13.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/doc/sgml/Makefile.in 2009-12-15 23:04:56.340321615 +0100 +@@ -260,6 +260,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/dri/Makefile.in xorg-server-20091215.patch/hw/xfree86/dri/Makefile.in +--- xorg-server-20091215/hw/xfree86/dri/Makefile.in 2009-12-15 20:10:13.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/dri/Makefile.in 2009-12-15 23:04:56.530321322 +0100 +@@ -292,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/dri2/Makefile.in xorg-server-20091215.patch/hw/xfree86/dri2/Makefile.in +--- xorg-server-20091215/hw/xfree86/dri2/Makefile.in 2009-12-15 20:10:13.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/dri2/Makefile.in 2009-12-15 23:04:56.713321799 +0100 +@@ -291,6 +291,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/exa/Makefile.in xorg-server-20091215.patch/hw/xfree86/exa/Makefile.in +--- xorg-server-20091215/hw/xfree86/exa/Makefile.in 2009-12-15 20:10:14.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/exa/Makefile.in 2009-12-15 23:04:56.890321350 +0100 +@@ -295,6 +295,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/fbdevhw/Makefile.in xorg-server-20091215.patch/hw/xfree86/fbdevhw/Makefile.in +--- xorg-server-20091215/hw/xfree86/fbdevhw/Makefile.in 2009-12-15 20:10:14.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/fbdevhw/Makefile.in 2009-12-15 23:04:57.076321556 +0100 +@@ -300,6 +300,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/i2c/Makefile.in xorg-server-20091215.patch/hw/xfree86/i2c/Makefile.in +--- xorg-server-20091215/hw/xfree86/i2c/Makefile.in 2009-12-15 20:10:14.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/i2c/Makefile.in 2009-12-15 23:04:57.299321502 +0100 +@@ -341,6 +341,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/int10/Makefile.in xorg-server-20091215.patch/hw/xfree86/int10/Makefile.in +--- xorg-server-20091215/hw/xfree86/int10/Makefile.in 2009-12-15 20:10:14.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/int10/Makefile.in 2009-12-15 23:04:57.495321436 +0100 +@@ -305,6 +305,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/loader/Makefile.in xorg-server-20091215.patch/hw/xfree86/loader/Makefile.in +--- xorg-server-20091215/hw/xfree86/loader/Makefile.in 2009-12-15 20:10:14.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/loader/Makefile.in 2009-12-15 23:04:57.663321379 +0100 +@@ -265,6 +265,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/Makefile.in xorg-server-20091215.patch/hw/xfree86/Makefile.in +--- xorg-server-20091215/hw/xfree86/Makefile.in 2009-12-15 20:10:11.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/Makefile.in 2009-12-15 23:04:54.982321299 +0100 +@@ -323,6 +323,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/modes/Makefile.in xorg-server-20091215.patch/hw/xfree86/modes/Makefile.in +--- xorg-server-20091215/hw/xfree86/modes/Makefile.in 2009-12-15 20:10:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/modes/Makefile.in 2009-12-15 23:04:57.838321179 +0100 +@@ -295,6 +295,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/bsd/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/bsd/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/bsd/Makefile.in 2009-12-15 20:10:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/bsd/Makefile.in 2009-12-15 23:04:58.274321340 +0100 +@@ -289,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/bus/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/bus/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/bus/Makefile.in 2009-12-15 20:10:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/bus/Makefile.in 2009-12-15 23:04:58.452321499 +0100 +@@ -297,6 +297,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/hurd/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/hurd/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/hurd/Makefile.in 2009-12-15 20:10:16.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/hurd/Makefile.in 2009-12-15 23:04:58.661321798 +0100 +@@ -265,6 +265,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/linux/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/linux/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/linux/Makefile.in 2009-12-15 20:10:16.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/linux/Makefile.in 2009-12-15 23:04:58.896321497 +0100 +@@ -290,6 +290,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/Makefile.in 2009-12-15 20:10:15.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/Makefile.in 2009-12-15 23:04:58.013321539 +0100 +@@ -326,6 +326,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/misc/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/misc/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/misc/Makefile.in 2009-12-15 20:10:16.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/misc/Makefile.in 2009-12-15 23:04:59.061321709 +0100 +@@ -263,6 +263,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/sco/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/sco/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/sco/Makefile.in 2009-12-15 20:10:16.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/sco/Makefile.in 2009-12-15 23:04:59.195321154 +0100 +@@ -237,6 +237,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/solaris/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/solaris/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/solaris/Makefile.in 2009-12-15 20:10:17.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/solaris/Makefile.in 2009-12-15 23:04:59.425321515 +0100 +@@ -312,6 +312,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/os-support/sysv/Makefile.in xorg-server-20091215.patch/hw/xfree86/os-support/sysv/Makefile.in +--- xorg-server-20091215/hw/xfree86/os-support/sysv/Makefile.in 2009-12-15 20:10:17.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/os-support/sysv/Makefile.in 2009-12-15 23:04:59.560321288 +0100 +@@ -237,6 +237,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/parser/Makefile.in xorg-server-20091215.patch/hw/xfree86/parser/Makefile.in +--- xorg-server-20091215/hw/xfree86/parser/Makefile.in 2009-12-15 20:10:17.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/parser/Makefile.in 2009-12-15 23:04:59.852321576 +0100 +@@ -320,6 +320,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/ramdac/Makefile.in xorg-server-20091215.patch/hw/xfree86/ramdac/Makefile.in +--- xorg-server-20091215/hw/xfree86/ramdac/Makefile.in 2009-12-15 20:10:17.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/ramdac/Makefile.in 2009-12-15 23:05:00.025320997 +0100 +@@ -289,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/shadowfb/Makefile.in xorg-server-20091215.patch/hw/xfree86/shadowfb/Makefile.in +--- xorg-server-20091215/hw/xfree86/shadowfb/Makefile.in 2009-12-15 20:10:17.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/shadowfb/Makefile.in 2009-12-15 23:05:00.199321375 +0100 +@@ -292,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/utils/cvt/Makefile.in xorg-server-20091215.patch/hw/xfree86/utils/cvt/Makefile.in +--- xorg-server-20091215/hw/xfree86/utils/cvt/Makefile.in 2009-12-15 20:10:18.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/utils/cvt/Makefile.in 2009-12-15 23:05:00.531321200 +0100 +@@ -325,6 +325,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/utils/gtf/Makefile.in xorg-server-20091215.patch/hw/xfree86/utils/gtf/Makefile.in +--- xorg-server-20091215/hw/xfree86/utils/gtf/Makefile.in 2009-12-15 20:10:18.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/utils/gtf/Makefile.in 2009-12-15 23:05:00.723321283 +0100 +@@ -324,6 +324,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/utils/Makefile.in xorg-server-20091215.patch/hw/xfree86/utils/Makefile.in +--- xorg-server-20091215/hw/xfree86/utils/Makefile.in 2009-12-15 20:10:18.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/utils/Makefile.in 2009-12-15 23:05:00.338321208 +0100 +@@ -277,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/vbe/Makefile.in xorg-server-20091215.patch/hw/xfree86/vbe/Makefile.in +--- xorg-server-20091215/hw/xfree86/vbe/Makefile.in 2009-12-15 20:10:18.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/vbe/Makefile.in 2009-12-15 23:05:00.894321165 +0100 +@@ -291,6 +291,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/vgahw/Makefile.in xorg-server-20091215.patch/hw/xfree86/vgahw/Makefile.in +--- xorg-server-20091215/hw/xfree86/vgahw/Makefile.in 2009-12-15 20:10:19.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/vgahw/Makefile.in 2009-12-15 23:05:01.068321124 +0100 +@@ -291,6 +291,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/x86emu/Makefile.in xorg-server-20091215.patch/hw/xfree86/x86emu/Makefile.in +--- xorg-server-20091215/hw/xfree86/x86emu/Makefile.in 2009-12-15 20:10:19.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/x86emu/Makefile.in 2009-12-15 23:05:01.234321315 +0100 +@@ -264,6 +264,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/xaa/Makefile.in xorg-server-20091215.patch/hw/xfree86/xaa/Makefile.in +--- xorg-server-20091215/hw/xfree86/xaa/Makefile.in 2009-12-15 20:10:19.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/xaa/Makefile.in 2009-12-15 23:05:01.433321395 +0100 +@@ -311,6 +311,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xfree86/xf8_16bpp/Makefile.in xorg-server-20091215.patch/hw/xfree86/xf8_16bpp/Makefile.in +--- xorg-server-20091215/hw/xfree86/xf8_16bpp/Makefile.in 2009-12-15 20:10:19.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xfree86/xf8_16bpp/Makefile.in 2009-12-15 23:05:01.605321115 +0100 +@@ -292,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xnest/Makefile.in xorg-server-20091215.patch/hw/xnest/Makefile.in +--- xorg-server-20091215/hw/xnest/Makefile.in 2009-12-15 20:10:20.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xnest/Makefile.in 2009-12-15 23:05:01.827321356 +0100 +@@ -313,6 +313,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/bundle/Makefile.in xorg-server-20091215.patch/hw/xquartz/bundle/Makefile.in +--- xorg-server-20091215/hw/xquartz/bundle/Makefile.in 2009-12-15 20:10:20.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/bundle/Makefile.in 2009-12-15 23:05:02.342321374 +0100 +@@ -270,6 +270,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/doc/Makefile.in xorg-server-20091215.patch/hw/xquartz/doc/Makefile.in +--- xorg-server-20091215/hw/xquartz/doc/Makefile.in 2009-12-15 20:10:21.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/doc/Makefile.in 2009-12-15 23:05:02.488321272 +0100 +@@ -266,6 +266,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/GL/Makefile.in xorg-server-20091215.patch/hw/xquartz/GL/Makefile.in +--- xorg-server-20091215/hw/xquartz/GL/Makefile.in 2009-12-15 20:10:20.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/GL/Makefile.in 2009-12-15 23:05:01.993321338 +0100 +@@ -264,6 +264,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/mach-startup/Makefile.in xorg-server-20091215.patch/hw/xquartz/mach-startup/Makefile.in +--- xorg-server-20091215/hw/xquartz/mach-startup/Makefile.in 2009-12-15 20:10:21.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/mach-startup/Makefile.in 2009-12-15 23:05:02.671321327 +0100 +@@ -301,6 +301,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/Makefile.in xorg-server-20091215.patch/hw/xquartz/Makefile.in +--- xorg-server-20091215/hw/xquartz/Makefile.in 2009-12-15 20:10:20.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/Makefile.in 2009-12-15 23:05:02.193321537 +0100 +@@ -317,6 +317,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/pbproxy/Makefile.in xorg-server-20091215.patch/hw/xquartz/pbproxy/Makefile.in +--- xorg-server-20091215/hw/xquartz/pbproxy/Makefile.in 2009-12-15 20:10:21.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/pbproxy/Makefile.in 2009-12-15 23:05:02.860321819 +0100 +@@ -292,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xquartz/xpr/Makefile.in xorg-server-20091215.patch/hw/xquartz/xpr/Makefile.in +--- xorg-server-20091215/hw/xquartz/xpr/Makefile.in 2009-12-15 20:10:21.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xquartz/xpr/Makefile.in 2009-12-15 23:05:03.026321241 +0100 +@@ -265,6 +265,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/hw/xwin/Makefile.in xorg-server-20091215.patch/hw/xwin/Makefile.in +--- xorg-server-20091215/hw/xwin/Makefile.in 2009-12-15 20:10:21.000000000 +0100 ++++ xorg-server-20091215.patch/hw/xwin/Makefile.in 2009-12-15 23:05:03.289321209 +0100 +@@ -388,6 +388,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/include/dix-config.h.in xorg-server-20091215.patch/include/dix-config.h.in +--- xorg-server-20091215/include/dix-config.h.in 2009-12-14 23:34:15.000000000 +0100 ++++ xorg-server-20091215.patch/include/dix-config.h.in 2009-12-15 23:04:05.478321507 +0100 +@@ -396,6 +396,9 @@ + /* Support D-Bus */ + #undef HAVE_DBUS + ++/* Use libudev for input hotplug */ ++#undef CONFIG_UDEV ++ + /* Use D-Bus for input hotplug */ + #undef CONFIG_NEED_DBUS + +diff -Naur xorg-server-20091215/include/do-not-use-config.h.in xorg-server-20091215.patch/include/do-not-use-config.h.in +--- xorg-server-20091215/include/do-not-use-config.h.in 2009-12-15 20:10:01.000000000 +0100 ++++ xorg-server-20091215.patch/include/do-not-use-config.h.in 2009-12-15 23:04:46.000000000 +0100 +@@ -36,6 +36,9 @@ + /* Use D-Bus for input hotplug */ + #undef CONFIG_NEED_DBUS + ++/* Use libudev for input hotplug */ ++#undef CONFIG_UDEV ++ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +diff -Naur xorg-server-20091215/include/do-not-use-config.h.in~ xorg-server-20091215.patch/include/do-not-use-config.h.in~ +--- xorg-server-20091215/include/do-not-use-config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-20091215.patch/include/do-not-use-config.h.in~ 2009-12-15 20:10:01.000000000 +0100 +@@ -0,0 +1,761 @@ ++/* include/do-not-use-config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define if building universal (internal helper macro) */ ++#undef AC_APPLE_UNIVERSAL_BUILD ++ ++/* Build AIGLX loader */ ++#undef AIGLX ++ ++/* Default base font path */ ++#undef BASE_FONT_PATH ++ ++/* Support BigRequests extension */ ++#undef BIGREQS ++ ++/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ ++#undef BSD44SOCKETS ++ ++/* Builder address */ ++#undef BUILDERADDR ++ ++/* Builder string */ ++#undef BUILDERSTRING ++ ++/* Default font path */ ++#undef COMPILEDDEFAULTFONTPATH ++ ++/* Support Composite Extension */ ++#undef COMPOSITE ++ ++/* Use the D-Bus input configuration API */ ++#undef CONFIG_DBUS_API ++ ++/* Use the HAL hotplug API */ ++#undef CONFIG_HAL ++ ++/* Use D-Bus for input hotplug */ ++#undef CONFIG_NEED_DBUS ++ ++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ++ systems. This function is required for `alloca.c' support on those systems. ++ */ ++#undef CRAY_STACKSEG_END ++ ++/* System is BSD-like */ ++#undef CSRG_BASED ++ ++/* Simple debug messages */ ++#undef CYGDEBUG ++ ++/* Debug window manager */ ++#undef CYGMULTIWINDOW_DEBUG ++ ++/* Debug messages for window handling */ ++#undef CYGWINDOWING_DEBUG ++ ++/* Define to 1 if using `alloca.c'. */ ++#undef C_ALLOCA ++ ++/* Support Damage extension */ ++#undef DAMAGE ++ ++/* Support DBE extension */ ++#undef DBE ++ ++/* Use ddxBeforeReset */ ++#undef DDXBEFORERESET ++ ++/* Use OsVendorVErrorF */ ++#undef DDXOSVERRORF ++ ++/* Enable debugging code */ ++#undef DEBUG ++ ++/* Default library install path */ ++#undef DEFAULT_LIBRARY_PATH ++ ++/* Default log location */ ++#undef DEFAULT_LOGPREFIX ++ ++/* Default module search path */ ++#undef DEFAULT_MODULE_PATH ++ ++/* Support DGA extension */ ++#undef DGA ++ ++/* Support DPMS extension */ ++#undef DPMSExtension ++ ++/* Build DRI2 extension */ ++#undef DRI2 ++ ++/* Build DRI2 AIGLX loader */ ++#undef DRI2_AIGLX ++ ++/* Default DRI driver path */ ++#undef DRI_DRIVER_PATH ++ ++/* Build GLX extension */ ++#undef GLXEXT ++ ++/* Support XDM-AUTH*-1 */ ++#undef HASXDMAUTH ++ ++/* System has /dev/xf86 aperture driver */ ++#undef HAS_APERTURE_DRV ++ ++/* Cygwin has /dev/windows for signaling new win32 messages */ ++#undef HAS_DEVWINDOWS ++ ++/* Have the 'getdtablesize' function. */ ++#undef HAS_GETDTABLESIZE ++ ++/* Have the 'getifaddrs' function. */ ++#undef HAS_GETIFADDRS ++ ++/* Have the 'getpeereid' function. */ ++#undef HAS_GETPEEREID ++ ++/* Have the 'getpeerucred' function. */ ++#undef HAS_GETPEERUCRED ++ ++/* Have the 'mmap' function. */ ++#undef HAS_MMAP ++ ++/* Define to 1 if NetBSD built-in MTRR support is available */ ++#undef HAS_MTRR_BUILTIN ++ ++/* MTRR support available */ ++#undef HAS_MTRR_SUPPORT ++ ++/* Support SHM */ ++#undef HAS_SHM ++ ++/* Have the 'strlcpy' function */ ++#undef HAS_STRLCPY ++ ++/* Use Windows sockets */ ++#undef HAS_WINSOCK ++ ++/* Define to 1 if you have `alloca', as a function or macro. */ ++#undef HAVE_ALLOCA ++ ++/* Define to 1 if you have and it should be used (not on Ultrix). ++ */ ++#undef HAVE_ALLOCA_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ASM_MTRR_H ++ ++/* Define to 1 if you have the `authdes_create' function. */ ++#undef HAVE_AUTHDES_CREATE ++ ++/* Define to 1 if you have the `authdes_seccreate' function. */ ++#undef HAVE_AUTHDES_SECCREATE ++ ++/* "Have avc_netlink_acquire_fd" */ ++#undef HAVE_AVC_NETLINK_ACQUIRE_FD ++ ++/* Has backtrace support */ ++#undef HAVE_BACKTRACE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_BYTESWAP_H ++ ++/* Have the 'cbrt' function */ ++#undef HAVE_CBRT ++ ++/* Define to 1 if you have the `clock_gettime' function. */ ++#undef HAVE_CLOCK_GETTIME ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DBM_H ++ ++/* Have D-Bus support */ ++#undef HAVE_DBUS ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_DIRENT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ ++#undef HAVE_DOPRNT ++ ++/* Have execinfo.h */ ++#undef HAVE_EXECINFO_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_FCNTL_H ++ ++/* Define to 1 if you have the `ffs' function. */ ++#undef HAVE_FFS ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the `getisax' function. */ ++#undef HAVE_GETISAX ++ ++/* Define to 1 if you have the `getopt' function. */ ++#undef HAVE_GETOPT ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#undef HAVE_GETOPT_LONG ++ ++/* Define to 1 if you have the `getuid' function. */ ++#undef HAVE_GETUID ++ ++/* Define to 1 if you have the `getzoneid' function. */ ++#undef HAVE_GETZONEID ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the `audit' library (-laudit). */ ++#undef HAVE_LIBAUDIT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LIBAUDIT_H ++ ++/* Define to 1 if you have the `m' library (-lm). */ ++#undef HAVE_LIBM ++ ++/* Define to 1 if you have the `selinux' library (-lselinux). */ ++#undef HAVE_LIBSELINUX ++ ++/* Define to 1 if you have the `link' function. */ ++#undef HAVE_LINK ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_AGPGART_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_APM_BIOS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_FB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MACHINE_MTRR_H ++ ++/* Define to 1 if you have the `memmove' function. */ ++#undef HAVE_MEMMOVE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the `memset' function. */ ++#undef HAVE_MEMSET ++ ++/* Define to 1 if you have the `mkstemp' function. */ ++#undef HAVE_MKSTEMP ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NDBM_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the `pci_device_enable' function. */ ++#undef HAVE_PCI_DEVICE_ENABLE ++ ++/* Define to 1 if you have the `pci_device_is_boot_vga' function. */ ++#undef HAVE_PCI_DEVICE_IS_BOOT_VGA ++ ++/* Define to 1 if you have the `pci_device_vgaarb_init' function. */ ++#undef HAVE_PCI_DEVICE_VGAARB_INIT ++ ++/* Define to 1 if you have the `pci_system_init_dev_mem' function. */ ++#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_RPCSVC_DBM_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SELINUX_AVC_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SELINUX_SELINUX_H ++ ++/* Use CommonCrypto SHA1 functions */ ++#undef HAVE_SHA1_IN_COMMONCRYPTO ++ ++/* Use libc SHA1 functions */ ++#undef HAVE_SHA1_IN_LIBC ++ ++/* Use libgcrypt SHA1 functions */ ++#undef HAVE_SHA1_IN_LIBGCRYPT ++ ++/* Use libmd SHA1 functions */ ++#undef HAVE_SHA1_IN_LIBMD ++ ++/* Use libsha1 for SHA1 */ ++#undef HAVE_SHA1_IN_LIBSHA1 ++ ++/* Define to 1 if you have the `shmctl64' function. */ ++#undef HAVE_SHMCTL64 ++ ++/* Define to 1 if the system has the type `socklen_t'. */ ++#undef HAVE_SOCKLEN_T ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the `strcasestr' function. */ ++#undef HAVE_STRCASESTR ++ ++/* Define to 1 if you have the `strchr' function. */ ++#undef HAVE_STRCHR ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STROPTS_H ++ ++/* Define to 1 if you have the `strrchr' function. */ ++#undef HAVE_STRRCHR ++ ++/* Define to 1 if you have the `strtol' function. */ ++#undef HAVE_STRTOL ++ ++/* Define to 1 if SYSV IPC is available */ ++#undef HAVE_SYSV_IPC ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_AGPGART_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_AGPIO_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_DIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_IO_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_KD_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_LINKER_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_MEMRANGE_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_VM86_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_VT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `vprintf' function. */ ++#undef HAVE_VPRINTF ++ ++/* Define to 1 if you have the `vsnprintf' function. */ ++#undef HAVE_VSNPRINTF ++ ++/* Define to 1 if you have the `walkcontext' function. */ ++#undef HAVE_WALKCONTEXT ++ ++/* Support IPv6 for TCP connections */ ++#undef IPv6 ++ ++/* Build kdrive ddx */ ++#undef KDRIVEDDXACTIONS ++ ++/* Build fbdev-based kdrive server */ ++#undef KDRIVEFBDEV ++ ++/* Build Kdrive X server */ ++#undef KDRIVESERVER ++ ++/* Prefix to use for launchd identifiers */ ++#undef LAUNCHD_ID_PREFIX ++ ++/* Support os-specific local connections */ ++#undef LOCALCONN ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ ++/* Support MIT-SHM extension */ ++#undef MITSHM ++ ++/* Have monotonic clock from clock_gettime() */ ++#undef MONOTONIC_CLOCK ++ ++/* Build Multibuffer extension */ ++#undef MULTIBUFFER ++ ++/* Do not have 'strcasecmp'. */ ++#undef NEED_STRCASECMP ++ ++/* Do not have 'strcasestr'. */ ++#undef NEED_STRCASESTR ++ ++/* Do not have 'strncasecmp'. */ ++#undef NEED_STRNCASECMP ++ ++/* Need XFree86 helper functions */ ++#undef NEED_XF86_PROTOTYPES ++ ++/* Need XFree86 typedefs */ ++#undef NEED_XF86_TYPES ++ ++/* Define to 1 if modules should avoid the libcwrapper */ ++#undef NO_LIBCWRAPPER ++ ++/* Use an empty root cursor */ ++#undef NULL_ROOT_CURSOR ++ ++/* Operating System Name */ ++#undef OSNAME ++ ++/* Operating System Vendor */ ++#undef OSVENDOR ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Major version of this package */ ++#undef PACKAGE_VERSION_MAJOR ++ ++/* Minor version of this package */ ++#undef PACKAGE_VERSION_MINOR ++ ++/* Patch version of this package */ ++#undef PACKAGE_VERSION_PATCHLEVEL ++ ++/* Internal define for Xinerama */ ++#undef PANORAMIX ++ ++/* System has PC console */ ++#undef PCCONS_SUPPORT ++ ++/* Default PCI text file ID path */ ++#undef PCI_TXT_IDS_PATH ++ ++/* System has PC console */ ++#undef PCVT_SUPPORT ++ ++/* Overall prefix */ ++#undef PROJECTROOT ++ ++/* Support RANDR extension */ ++#undef RANDR ++ ++/* Make PROJECT_ROOT relative to the xserver location */ ++#undef RELOCATE_PROJECTROOT ++ ++/* Support RENDER extension */ ++#undef RENDER ++ ++/* Support X resource extension */ ++#undef RES ++ ++/* Define as the return type of signal handlers (`int' or `void'). */ ++#undef RETSIGTYPE ++ ++/* Build Rootless code */ ++#undef ROOTLESS ++ ++/* Support MIT-SCREEN-SAVER extension */ ++#undef SCREENSAVER ++ ++/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ ++#undef SECURE_RPC ++ ++/* Server miscellaneous config path */ ++#undef SERVER_MISC_CONFIG_PATH ++ ++/* Support SHAPE extension */ ++#undef SHAPE ++ ++/* The size of `unsigned long', as computed by sizeof. */ ++#undef SIZEOF_UNSIGNED_LONG ++ ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at runtime. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown */ ++#undef STACK_DIRECTION ++ ++/* Build a standalone xpbproxy */ ++#undef STANDALONE_XPBPROXY ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Define to 1 on systems derived from System V Release 4 */ ++#undef SVR4 ++ ++/* System has syscons console */ ++#undef SYSCONS_SUPPORT ++ ++/* Support TCP socket connections */ ++#undef TCPCONN ++ ++/* Have tslib support */ ++#undef TSLIB ++ ++/* Enable unit tests */ ++#undef UNITTESTS ++ ++/* Support UNIX socket connections */ ++#undef UNIXCONN ++ ++/* NetBSD PIO alpha IO */ ++#undef USE_ALPHA_PIO ++ ++/* BSD AMD64 iopl */ ++#undef USE_AMD64_IOPL ++ ++/* BSD /dev/io */ ++#undef USE_DEV_IO ++ ++/* BSD i386 iopl */ ++#undef USE_I386_IOPL ++ ++/* Use SIGIO handlers for input device events by default */ ++#undef USE_SIGIO_BY_DEFAULT ++ ++/* Define to use byteswap macros from */ ++#undef USE_SYS_ENDIAN_H ++ ++/* Vendor man version */ ++#undef VENDOR_MAN_VERSION ++ ++/* Vendor name */ ++#undef VENDOR_NAME ++ ++/* Vendor name */ ++#undef VENDOR_NAME_SHORT ++ ++/* Vendor release */ ++#undef VENDOR_RELEASE ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Building vgahw module */ ++#undef WITH_VGAHW ++ ++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most ++ significant byte first (like Motorola and SPARC, unlike Intel). */ ++#if defined AC_APPLE_UNIVERSAL_BUILD ++# if defined __BIG_ENDIAN__ ++# define WORDS_BIGENDIAN 1 ++# endif ++#else ++# ifndef WORDS_BIGENDIAN ++# undef WORDS_BIGENDIAN ++# endif ++#endif ++ ++/* System has wscons console */ ++#undef WSCONS_SUPPORT ++ ++/* Build X-ACE extension */ ++#undef XACE ++ ++/* Build XCalibrate extension */ ++#undef XCALIBRATE ++ ++/* Support XCMisc extension */ ++#undef XCMISC ++ ++/* Build Security extension */ ++#undef XCSECURITY ++ ++/* Support XDM Control Protocol */ ++#undef XDMCP ++ ++/* Support XF86 Big font extension */ ++#undef XF86BIGFONT ++ ++/* Name of configuration file */ ++#undef XF86CONFIGFILE ++ ++/* Build DRI extension */ ++#undef XF86DRI ++ ++/* Support XFree86 Video Mode extension */ ++#undef XF86VIDMODE ++ ++/* Support XFixes extension */ ++#undef XFIXES ++ ++/* Building loadable XFree86 server */ ++#undef XFree86LOADER ++ ++/* Building XFree86 server */ ++#undef XFree86Server ++ ++/* Build XDGA support */ ++#undef XFreeXDGA ++ ++/* Support Xinerama extension */ ++#undef XINERAMA ++ ++/* Path to XKB data */ ++#undef XKB_BASE_DIRECTORY ++ ++/* Path to XKB bin dir */ ++#undef XKB_BIN_DIRECTORY ++ ++/* Default XKB layout */ ++#undef XKB_DFLT_LAYOUT ++ ++/* Default XKB model */ ++#undef XKB_DFLT_MODEL ++ ++/* Default XKB options */ ++#undef XKB_DFLT_OPTIONS ++ ++/* Default XKB ruleset */ ++#undef XKB_DFLT_RULES ++ ++/* Default XKB variant */ ++#undef XKB_DFLT_VARIANT ++ ++/* Path to XKB output dir */ ++#undef XKM_OUTPUT_DIR ++ ++/* Building Xorg server */ ++#undef XORGSERVER ++ ++/* Vendor release */ ++#undef XORG_DATE ++ ++/* Vendor man version */ ++#undef XORG_MAN_VERSION ++ ++/* Building Xorg server */ ++#undef XORG_SERVER ++ ++/* Current Xorg version */ ++#undef XORG_VERSION_CURRENT ++ ++/* Have Quartz */ ++#undef XQUARTZ ++ ++/* Support application updating through sparkle. */ ++#undef XQUARTZ_SPARKLE ++ ++/* Support Record extension */ ++#undef XRECORD ++ ++/* Build registry module */ ++#undef XREGISTRY ++ ++/* Build SELinux extension */ ++#undef XSELINUX ++ ++/* Define to 1 if the DTrace Xserver provider probes should be built in. */ ++#undef XSERVER_DTRACE ++ ++/* Use libpciaccess for all pci manipulation */ ++#undef XSERVER_LIBPCIACCESS ++ ++/* Support XSync extension */ ++#undef XSYNC ++ ++/* Support XTest extension */ ++#undef XTEST ++ ++/* Support Xv extension */ ++#undef XV ++ ++/* Vendor name */ ++#undef XVENDORNAME ++ ++/* Short vendor name */ ++#undef XVENDORNAMESHORT ++ ++/* Build Xv extension */ ++#undef XvExtension ++ ++/* Build XvMC extension */ ++#undef XvMCExtension ++ ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++#undef YYTEXT_POINTER ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Enable GNU and other extensions to the C environment for glibc */ ++#undef _GNU_SOURCE ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ ++/* Define to 1 if unsigned long is 64 bits. */ ++#undef _XSERVER64 ++ ++/* Vendor web address for support */ ++#undef __VENDORDWEBSUPPORT__ ++ ++/* Name of configuration file */ ++#undef __XCONFIGFILE__ ++ ++/* Name of X server */ ++#undef __XSERVERNAME__ ++ ++/* Define to 16-bit byteswap macro */ ++#undef bswap_16 ++ ++/* Define to 32-bit byteswap macro */ ++#undef bswap_32 ++ ++/* Define to 64-bit byteswap macro */ ++#undef bswap_64 ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const ++ ++/* Define to `int' if does not define. */ ++#undef pid_t +diff -Naur xorg-server-20091215/include/Makefile.in xorg-server-20091215.patch/include/Makefile.in +--- xorg-server-20091215/include/Makefile.in 2009-12-15 20:10:22.000000000 +0100 ++++ xorg-server-20091215.patch/include/Makefile.in 2009-12-15 23:05:03.454321280 +0100 +@@ -274,6 +274,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/Makefile.in xorg-server-20091215.patch/Makefile.in +--- xorg-server-20091215/Makefile.in 2009-12-15 20:10:26.000000000 +0100 ++++ xorg-server-20091215.patch/Makefile.in 2009-12-15 23:05:06.249321425 +0100 +@@ -315,6 +315,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/mi/Makefile.in xorg-server-20091215.patch/mi/Makefile.in +--- xorg-server-20091215/mi/Makefile.in 2009-12-15 20:10:22.000000000 +0100 ++++ xorg-server-20091215.patch/mi/Makefile.in 2009-12-15 23:05:03.638321106 +0100 +@@ -299,6 +299,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/miext/cw/Makefile.in xorg-server-20091215.patch/miext/cw/Makefile.in +--- xorg-server-20091215/miext/cw/Makefile.in 2009-12-15 20:10:22.000000000 +0100 ++++ xorg-server-20091215.patch/miext/cw/Makefile.in 2009-12-15 23:05:03.949321283 +0100 +@@ -263,6 +263,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/miext/damage/Makefile.in xorg-server-20091215.patch/miext/damage/Makefile.in +--- xorg-server-20091215/miext/damage/Makefile.in 2009-12-15 20:10:23.000000000 +0100 ++++ xorg-server-20091215.patch/miext/damage/Makefile.in 2009-12-15 23:05:04.122321749 +0100 +@@ -289,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/miext/Makefile.in xorg-server-20091215.patch/miext/Makefile.in +--- xorg-server-20091215/miext/Makefile.in 2009-12-15 20:10:22.000000000 +0100 ++++ xorg-server-20091215.patch/miext/Makefile.in 2009-12-15 23:05:03.782321324 +0100 +@@ -279,6 +279,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/miext/rootless/Makefile.in xorg-server-20091215.patch/miext/rootless/Makefile.in +--- xorg-server-20091215/miext/rootless/Makefile.in 2009-12-15 20:10:23.000000000 +0100 ++++ xorg-server-20091215.patch/miext/rootless/Makefile.in 2009-12-15 23:05:04.289321570 +0100 +@@ -264,6 +264,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/miext/shadow/Makefile.in xorg-server-20091215.patch/miext/shadow/Makefile.in +--- xorg-server-20091215/miext/shadow/Makefile.in 2009-12-15 20:10:23.000000000 +0100 ++++ xorg-server-20091215.patch/miext/shadow/Makefile.in 2009-12-15 23:05:04.466321537 +0100 +@@ -294,6 +294,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/os/Makefile.in xorg-server-20091215.patch/os/Makefile.in +--- xorg-server-20091215/os/Makefile.in 2009-12-15 20:10:23.000000000 +0100 ++++ xorg-server-20091215.patch/os/Makefile.in 2009-12-15 23:05:04.656321449 +0100 +@@ -288,6 +288,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/randr/Makefile.in xorg-server-20091215.patch/randr/Makefile.in +--- xorg-server-20091215/randr/Makefile.in 2009-12-15 20:10:24.000000000 +0100 ++++ xorg-server-20091215.patch/randr/Makefile.in 2009-12-15 23:05:04.834321536 +0100 +@@ -298,6 +298,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/record/Makefile.in xorg-server-20091215.patch/record/Makefile.in +--- xorg-server-20091215/record/Makefile.in 2009-12-15 20:10:24.000000000 +0100 ++++ xorg-server-20091215.patch/record/Makefile.in 2009-12-15 23:05:05.000321586 +0100 +@@ -263,6 +263,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/render/Makefile.in xorg-server-20091215.patch/render/Makefile.in +--- xorg-server-20091215/render/Makefile.in 2009-12-15 20:10:24.000000000 +0100 ++++ xorg-server-20091215.patch/render/Makefile.in 2009-12-15 23:05:05.176321224 +0100 +@@ -292,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/test/Makefile.in xorg-server-20091215.patch/test/Makefile.in +--- xorg-server-20091215/test/Makefile.in 2009-12-15 20:10:24.000000000 +0100 ++++ xorg-server-20091215.patch/test/Makefile.in 2009-12-15 23:05:05.374321601 +0100 +@@ -334,6 +334,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/test/xi2/Makefile.in xorg-server-20091215.patch/test/xi2/Makefile.in +--- xorg-server-20091215/test/xi2/Makefile.in 2009-12-15 20:10:25.000000000 +0100 ++++ xorg-server-20091215.patch/test/xi2/Makefile.in 2009-12-15 23:05:05.721338437 +0100 +@@ -401,6 +401,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/Xext/Makefile.in xorg-server-20091215.patch/Xext/Makefile.in +--- xorg-server-20091215/Xext/Makefile.in 2009-12-15 20:10:05.000000000 +0100 ++++ xorg-server-20091215.patch/Xext/Makefile.in 2009-12-15 23:04:50.046321584 +0100 +@@ -364,6 +364,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/xfixes/Makefile.in xorg-server-20091215.patch/xfixes/Makefile.in +--- xorg-server-20091215/xfixes/Makefile.in 2009-12-15 20:10:25.000000000 +0100 ++++ xorg-server-20091215.patch/xfixes/Makefile.in 2009-12-15 23:05:05.898321362 +0100 +@@ -290,6 +290,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/Xi/Makefile.in xorg-server-20091215.patch/Xi/Makefile.in +--- xorg-server-20091215/Xi/Makefile.in 2009-12-15 20:10:05.000000000 +0100 ++++ xorg-server-20091215.patch/Xi/Makefile.in 2009-12-15 23:04:50.225321169 +0100 +@@ -274,6 +274,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-20091215/xkb/Makefile.in xorg-server-20091215.patch/xkb/Makefile.in +--- xorg-server-20091215/xkb/Makefile.in 2009-12-15 20:10:25.000000000 +0100 ++++ xorg-server-20091215.patch/xkb/Makefile.in 2009-12-15 23:05:06.086321104 +0100 +@@ -299,6 +299,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff new file mode 100644 index 0000000000..961abbad54 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff @@ -0,0 +1,66 @@ +diff -Naur xorg-server-20091215/autom4te.cache/output.0 xorg-server-20091215.patch/autom4te.cache/output.0 +diff -Naur xorg-server-20091215/autom4te.cache/requests xorg-server-20091215.patch/autom4te.cache/requests +diff -Naur xorg-server-20091215/autom4te.cache/traces.0 xorg-server-20091215.patch/autom4te.cache/traces.0 +diff -Naur xorg-server-20091215/config.log xorg-server-20091215.patch/config.log +diff -Naur xorg-server-20091215/configure xorg-server-20091215.patch/configure +--- xorg-server-20091215/configure 2009-12-15 20:40:42.188321308 +0100 ++++ xorg-server-20091215.patch/configure 2009-12-15 20:43:03.790321294 +0100 +@@ -21110,39 +21110,6 @@ + $as_echo "${FONT100DPIDIR}" >&6; } + + +-as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for ${sysconfdir}/X11/fontpath.d" >&5 +-$as_echo_n "checking for ${sysconfdir}/X11/fontpath.d... " >&6; } +-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "${sysconfdir}/X11/fontpath.d"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-ac_res=`eval 'as_val=${'$as_ac_File'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_File'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d' +-else +- +- DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" +- case $host_os in +- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; +- esac +- +-fi +- + + # Check whether --with-default-font-path was given. + if test "${with_default_font_path+set}" = set; then +diff -Naur xorg-server-20091215/configure.ac xorg-server-20091215.patch/configure.ac +--- xorg-server-20091215/configure.ac 2009-12-15 20:40:42.190321618 +0100 ++++ xorg-server-20091215.patch/configure.ac 2009-12-15 20:42:53.892447009 +0100 +@@ -504,14 +504,6 @@ + + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR +-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'], +- [ +- DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" +- case $host_os in +- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; +- esac +- ]) + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) +diff -Naur xorg-server-20091215/include/do-not-use-config.h.in~ xorg-server-20091215.patch/include/do-not-use-config.h.in~ diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index c06a9ee74f..f94c703343 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.99.1.tar.bz2 +http://sources.openelec.tv/svn/xorg-server-20091215.tar.bz2