--- atftp-0.7.dfsg.orig/configure +++ atftp-0.7.dfsg/configure @@ -1,81 +1,415 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.67. +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# # -# Copyright (C) 2003 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 Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi -DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +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 + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +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 +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + 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 || : +done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && 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 +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +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; } + +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 +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + 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 + 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 + + 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_unset $as_var + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi -done + exit 1 +fi +fi +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_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 + }' +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 + + +# as_fn_error STATUS 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=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +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 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else 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_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` - -# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -83,146 +417,107 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - 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 - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - 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=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - # 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 before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, 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 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + 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. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + 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; } # 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 sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +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=' ';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file else - as_expr=false + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,38 +526,25 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME= @@ -270,51 +552,164 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="tftp.c" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBPTHREAD LIBTERMCAP LIBREADLINE LIBWRAP LIBPCRE LIBOBJS LTLIBOBJS' +ac_subst_vars='LTLIBOBJS +LIBOBJS +LIBPCRE +LIBWRAP +LIBREADLINE +LIBTERMCAP +LIBPTHREAD +EGREP +GREP +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +PLATFORM +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +ISODATE +am__leading_dot +SET_MAKE +AWK +mkdir_p +INSTALL_STRIP_PROGRAM +STRIP +install_sh +AMTAR +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_libreadline +enable_libwrap +enable_libpcre +enable_mtftp +enable_debug +enable_dependency_tracking +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -337,34 +732,49 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -386,33 +796,59 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -439,6 +875,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -463,13 +905,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -534,6 +979,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -584,26 +1039,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -623,26 +1088,25 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -651,31 +1115,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac -done +fi -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var + # Remove trailing slashes. case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -689,8 +1158,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -702,74 +1171,72 @@ test "$silent" = yes && exec 6>/dev/null +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" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP +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" +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" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -792,20 +1259,17 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -815,18 +1279,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -847,6 +1318,7 @@ cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-libreadline enable readline support in client @@ -862,162 +1334,540 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.67 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2010 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 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -_ACEOF +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -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` + 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 -/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=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $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` -hostinfo = `(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_compile -_ASUNAME +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + 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; } > conftest.i && { + 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -} >&5 +} # ac_fn_c_try_cpp -cat >&5 <<_ACEOF +# 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 eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+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; } + +# 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.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$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:${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;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+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;} + +} # ac_fn_c_check_header_mongrel + +# 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 + + 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;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# 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 eval "test \"\${$3+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_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;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + 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 eval "test \"\${$3+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; +} +_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 + +# 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 eval "test \"\${$3+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 + +/* 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. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#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 + +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 +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 $as_me, which was +generated by GNU Autoconf 2.67. 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 ## ----------- ## @@ -1035,7 +1885,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1046,13 +1895,13 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + 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 @@ -1068,104 +1917,115 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + as_fn_append 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_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: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# 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 -## ---------------- ## + $as_echo "## ---------------- ## ## 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 `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + 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" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + 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 -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + 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 -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + 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 -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. @@ -1173,112 +2033,137 @@ #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 explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +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 /dev/null != "$ac_site_file" && 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" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } 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 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && 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;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $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 `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +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" + 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,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $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) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $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 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) 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'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi + { $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' @@ -1287,48 +2172,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - am__api_version="1.8" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + 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 + 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 + 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 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1343,22 +2215,23 @@ # 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. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 +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/* | \ + # 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. @@ -1366,7 +2239,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + 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. @@ -1376,30 +2249,43 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + 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 + 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. We don't cache a - # path for INSTALL within a source directory, because that will + # 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 path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ $as_echo "$as_me:${as_lineno-$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. @@ -1409,8 +2295,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1433,11 +2319,8 @@ # 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". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -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; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -1446,26 +2329,20 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1476,8 +2353,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi if mkdir -p -- . 2>/dev/null; then @@ -1509,10 +2386,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -1522,55 +2399,59 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +# 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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +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= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1586,9 +2467,7 @@ # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi # test whether we have cygpath @@ -1644,10 +2523,10 @@ 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -1657,35 +2536,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -1695,28 +2576,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + 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 ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -1730,123 +2621,140 @@ - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" ISODATE=`date +%Y-%m-%d` # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +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 +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 + +fi +{ $as_echo "$as_me:${as_lineno-$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 ;; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +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_n "checking host system type... " >&6; } +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 +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ $as_echo "$as_me:${as_lineno-$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 ;; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac PLATFORM="${host_vendor}-${host_cpu}-${host_os}" -# Check whether --enable-libreadline or --disable-libreadline was given. -if test "${enable_libreadline+set}" = set; then - enableval="$enable_libreadline" - case "${enableval}" in +# Check whether --enable-libreadline was given. +if test "${enable_libreadline+set}" = set; then : + enableval=$enable_libreadline; case "${enableval}" in yes) libreadline=true ;; no) libreadline=false ;; esac else libreadline=true -fi; +fi -# Check whether --enable-libwrap or --disable-libwrap was given. -if test "${enable_libwrap+set}" = set; then - enableval="$enable_libwrap" - case "${enableval}" in + +# Check whether --enable-libwrap was given. +if test "${enable_libwrap+set}" = set; then : + enableval=$enable_libwrap; case "${enableval}" in yes) libwrap=true ;; no) libwrap=flase ;; esac else libwrap=true -fi; +fi -# Check whether --enable-libpcre or --disable-libpcre was given. -if test "${enable_libpcre+set}" = set; then - enableval="$enable_libpcre" - case "${enableval}" in + +# Check whether --enable-libpcre was given. +if test "${enable_libpcre+set}" = set; then : + enableval=$enable_libpcre; case "${enableval}" in yes) libpcre=true ;; no) libpcre=flase ;; esac else libpcre=true -fi; +fi -# Check whether --enable-mtftp or --disable-mtftp was given. -if test "${enable_mtftp+set}" = set; then - enableval="$enable_mtftp" - case "${enableval}" in + +# Check whether --enable-mtftp was given. +if test "${enable_mtftp+set}" = set; then : + enableval=$enable_mtftp; case "${enableval}" in yes) mtftp=true ;; no) mtftp=flase ;; esac else mtftp=true -fi; +fi -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - case "${enableval}" in + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in yes) debug=true ;; no) debug=false ;; esac else debug=false -fi; +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1856,10 +2764,10 @@ 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1869,35 +2777,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1907,39 +2817,50 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + 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 ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - 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. + 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1949,99 +2870,60 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + fi fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC +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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else + ac_prog_rejected=no 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + 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 break 2 fi done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -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 $as_executable_p "$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" - 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 # We found a bogon in the path, so make sure we never use it. @@ -2059,24 +2941,25 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2086,39 +2969,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2128,66 +3013,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$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 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + 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 ;; +esac + CC=$ac_ct_CC + fi fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$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 ; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +$as_echo "$as_me:${as_lineno-$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" +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 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2199,112 +3096,108 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.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. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +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_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else - echo "$as_me: failed program was:" >&5 + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -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 -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.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 the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; 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 @@ -2312,38 +3205,90 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -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 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 + { { $as_echo "$as_me:${as_lineno-$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 ; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# 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_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { 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; } + if { ac_try='./conftest$ac_cv_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 + 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: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5 ; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$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 : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2355,45 +3300,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do +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>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$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 ; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$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 : + $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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2407,54 +3353,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$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 +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$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 : + $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 /* end confdefs.h. */ int @@ -2465,38 +3391,49 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -ac_cv_prog_cc_g=no +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +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 "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2512,18 +3449,14 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$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 : + $as_echo_n "(cached) " >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -2551,12 +3484,17 @@ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2571,201 +3509,37 @@ return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -rm -f conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# 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 "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f 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. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test "x$ac_cv_prog_cc_c89" != xno; then : fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2773,7 +3547,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2783,8 +3557,8 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$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= _am_result=none @@ -2811,15 +3585,15 @@ fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -2839,10 +3613,10 @@ depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$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 : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -2922,8 +3696,8 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ $as_echo "$as_me:${as_lineno-$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 @@ -2940,21 +3714,20 @@ - 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 -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -2968,11 +3741,7 @@ # 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -2981,78 +3750,34 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - 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 +rm -f conftest.err conftest.i 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 +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -3064,8 +3789,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3075,11 +3800,7 @@ # 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3088,85 +3809,40 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - 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 +rm -f conftest.err conftest.i 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 - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$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 ; } fi ac_ext=c @@ -3176,49 +3852,328 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi +{ $as_echo "$as_me:${as_lineno-$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 : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $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 + 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" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + 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 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$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_n "checking for egrep... " >&6; } +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 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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 +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $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 + 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" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + 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 + fi +else + ac_cv_path_EGREP=$EGREP fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + fi +fi +{ $as_echo "$as_me:${as_lineno-$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 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 confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +int +main () +{ -echo "$as_me:$LINENO: checking for AIX" >&5 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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. */ -#ifdef _AIX - yes -#endif +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 + $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 confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + _ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + 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 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; +} +_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 + +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 +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes +else + MINIX= +fi + + + if test "$MINIX" = yes; then + +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + + +$as_echo "#define _MINIX 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes +else + ac_cv_safe_to_define___extensions__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + + + CFLAGS="-g -Wall -D_REENTRANT" @@ -3244,463 +4199,248 @@ fi fi -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +# 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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +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= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" 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. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$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 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -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. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$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' if test x$mtftp = xtrue; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MTFTP 1 -_ACEOF +$as_echo "#define HAVE_MTFTP 1" >>confdefs.h fi -echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 +$as_echo_n "checking for pthread_create in -lpthread... " >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { -pthread_create (); +return pthread_create (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_create=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pthread_pthread_create=no + ac_cv_lib_pthread_pthread_create=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -if test $ac_cv_lib_pthread_pthread_create = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : LIBPTHREAD=-lpthread else - { { echo "$as_me:$LINENO: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "not found" "$LINENO" 5 fi if test x$libreadline = xtrue; then - echo "$as_me:$LINENO: checking for tgetent in -lreadline" >&5 -echo $ECHO_N "checking for tgetent in -lreadline... $ECHO_C" >&6 -if test "${ac_cv_lib_readline_tgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lreadline" >&5 +$as_echo_n "checking for tgetent in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_tgetent+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tgetent (); int main () { -tgetent (); +return tgetent (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_tgetent=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_readline_tgetent=no + ac_cv_lib_readline_tgetent=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_tgetent" >&6 -if test $ac_cv_lib_readline_tgetent = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_tgetent" >&5 +$as_echo "$ac_cv_lib_readline_tgetent" >&6; } +if test "x$ac_cv_lib_readline_tgetent" = x""yes; then : LIBTERMCAP="" else - echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 -echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 -if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 +$as_echo_n "checking for tgetent in -lncurses... " >&6; } +if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tgetent (); int main () { -tgetent (); +return tgetent (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ncurses_tgetent=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ncurses_tgetent=no + ac_cv_lib_ncurses_tgetent=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 -if test $ac_cv_lib_ncurses_tgetent = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } +if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then : LIBTERMCAP=-lncurses else - echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 -echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_tgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 +$as_echo_n "checking for tgetent in -lcurses... " >&6; } +if test "${ac_cv_lib_curses_tgetent+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tgetent (); int main () { -tgetent (); +return tgetent (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_curses_tgetent=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_curses_tgetent=no + ac_cv_lib_curses_tgetent=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6 -if test $ac_cv_lib_curses_tgetent = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5 +$as_echo "$ac_cv_lib_curses_tgetent" >&6; } +if test "x$ac_cv_lib_curses_tgetent" = x""yes; then : LIBTERMCAP=-lcurses else - echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 -echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 -if test "${ac_cv_lib_termcap_tgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 +$as_echo_n "checking for tgetent in -ltermcap... " >&6; } +if test "${ac_cv_lib_termcap_tgetent+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tgetent (); int main () { -tgetent (); +return tgetent (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_termcap_tgetent=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_termcap_tgetent=no + ac_cv_lib_termcap_tgetent=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 -if test $ac_cv_lib_termcap_tgetent = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } +if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then : LIBTERMCAP=-ltermcap else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -3711,225 +4451,138 @@ - echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 -if test "${ac_cv_lib_readline_readline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +$as_echo_n "checking for readline in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_readline+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBTERMCAP $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char readline (); int main () { -readline (); +return readline (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_readline=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_readline_readline=no + ac_cv_lib_readline_readline=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 -if test $ac_cv_lib_readline_readline = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +$as_echo "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = x""yes; then : LIBREADLINE=-lreadline -cat >>confdefs.h <<\_ACEOF -#define HAVE_READLINE 1 -_ACEOF +$as_echo "#define HAVE_READLINE 1" >>confdefs.h else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 -echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6 -if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 +$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBTERMCAP $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char rl_completion_matches (); int main () { -rl_completion_matches (); +return rl_completion_matches (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_rl_completion_matches=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_readline_rl_completion_matches=no + ac_cv_lib_readline_rl_completion_matches=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6 -if test $ac_cv_lib_readline_rl_completion_matches = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 +$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } +if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_RL_COMPLETION_MATCHES 1 -_ACEOF +$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h else - echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5 -echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6 -if test "${ac_cv_lib_readline_completion_matches+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for completion_matches in -lreadline" >&5 +$as_echo_n "checking for completion_matches in -lreadline... " >&6; } +if test "${ac_cv_lib_readline_completion_matches+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBTERMCAP $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char completion_matches (); int main () { -completion_matches (); +return completion_matches (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_completion_matches=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_readline_completion_matches=no + ac_cv_lib_readline_completion_matches=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6 -if test $ac_cv_lib_readline_completion_matches = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_completion_matches" >&5 +$as_echo "$ac_cv_lib_readline_completion_matches" >&6; } +if test "x$ac_cv_lib_readline_completion_matches" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_COMPLETION_MATCHES 1 -_ACEOF +$as_echo "#define HAVE_COMPLETION_MATCHES 1" >>confdefs.h else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -3939,13 +4592,9 @@ if test x$libwrap = xtrue; then orig_LIBS="$LIBS" LIBS="-lnsl -lwrap" - echo "$as_me:$LINENO: checking for hosts_ctl in -lwrap" >&5 -echo $ECHO_N "checking for hosts_ctl in -lwrap... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hosts_ctl in -lwrap" >&5 +$as_echo_n "checking for hosts_ctl in -lwrap... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -3961,138 +4610,80 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : LIBWRAP="-lnsl -lwrap" LIBS="$orig_LIBS" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_WRAP 1 -_ACEOF +$as_echo "#define HAVE_WRAP 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBWRAP="" + LIBWRAP="" LIBS="$orig_LIBS" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi if test x$libpcre = xtrue; then - echo "$as_me:$LINENO: checking for pcre_version in -lpcre" >&5 -echo $ECHO_N "checking for pcre_version in -lpcre... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_version in -lpcre" >&5 +$as_echo_n "checking for pcre_version in -lpcre... " >&6; } +if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pcre_version (); int main () { -pcre_version (); +return pcre_version (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pcre_pcre_version=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pcre_pcre_version=no + ac_cv_lib_pcre_pcre_version=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_version" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre_pcre_version" >&6 -if test $ac_cv_lib_pcre_pcre_version = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_version" >&5 +$as_echo "$ac_cv_lib_pcre_pcre_version" >&6; } +if test "x$ac_cv_lib_pcre_pcre_version" = x""yes; then : LIBPCRE=-lpcre -cat >>confdefs.h <<\_ACEOF -#define HAVE_PCRE 1 -_ACEOF +$as_echo "#define HAVE_PCRE 1" >>confdefs.h fi fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4107,50 +4698,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 @@ -4160,18 +4724,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 @@ -4181,16 +4741,13 @@ 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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + 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)) @@ -4210,1330 +4767,140 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ $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 -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +for ac_header in sys/time.h sys/types.h sys/socket.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" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done - - - - -for ac_header in sys/time.h sys/types.h sys/socket.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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> +for ac_header in arpa/inet.h arpa/tftp.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" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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> +done + +for ac_header in getopt.h unistd.h signal.h pthread.h argz.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" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +done -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +for ac_header in netdb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" +if test "x$ac_cv_header_netdb_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_NETDB_H 1 _ACEOF fi done - - -for ac_header in arpa/inet.h arpa/tftp.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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> +for ac_header in readline/readline.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_readline_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_READLINE_READLINE_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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> +done + +for ac_header in readline/history.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_history_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_READLINE_HISTORY_H 1 _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +done -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +if test x$libwrap = xtrue; then +for ac_header in tcpd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" +if test "x$ac_cv_header_tcpd_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_TCPD_H 1 _ACEOF fi done - - - - - -for ac_header in getopt.h unistd.h signal.h pthread.h argz.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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> +if test x$libpcre = xtrue; then +for ac_header in pcre.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" +if test "x$ac_cv_header_pcre_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PCRE_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +done - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in netdb.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in readline/readline.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in readline/history.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -if test x$libwrap = xtrue; then - -for ac_header in tcpd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -fi -if test x$libpcre = xtrue; then - -for ac_header in pcre.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - 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 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -fi - -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () @@ -5542,10 +4909,10 @@ #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset cs; /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; + 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}; @@ -5554,16 +4921,17 @@ an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; - ccp = &g + (g ? g-g : 0); + pcpcc = &g + (g ? g-g : 0); /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; + ++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}; @@ -5576,576 +4944,158 @@ ++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; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_time=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int -main () -{ -int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_signal=int -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - - - - - - - - -for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* 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 gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -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 -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} + "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 -int -main () -{ -return f != $ac_func; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" + ac_cv_c_const=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done +{ $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 +fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -for ac_func in strncasecmp strcasecmp strncmp -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* 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 +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF -#undef $ac_func +fi -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -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 -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include int main () { -return f != $ac_func; +if ((struct tm *) 0) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_header_time=no fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -done - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +fi -for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $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 >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -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 -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif +#include +#include int main () { -return f != $ac_func; +return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int else - 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_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + + +for ac_func in strchr memcpy strstr strcmp strncmp strncpy strlen +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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +done + +for ac_func in strncasecmp strcasecmp strncmp +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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +done + +for ac_func in socket gethostbyname gethostbyname_r gethostbyaddr +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" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done - ac_config_commands="$ac_config_commands default-1" +ac_config_commands="$ac_config_commands default-1" - ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" +ac_config_files="$ac_config_files Makefile test/Makefile redhat/atftp.spec" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -6164,39 +5114,59 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + 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 `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + 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 \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +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: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -6205,32 +5175,19 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + 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' done LIBOBJS=$ac_libobjs @@ -6238,26 +5195,22 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$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 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -6267,81 +5220,252 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi -DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +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 + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +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 +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + 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 || : +done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS 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=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&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; then + +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 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else 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_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -6349,148 +5473,123 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - 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 - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - 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=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # 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 before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, 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 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -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 sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +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=' ';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file else - as_expr=false + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +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=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -6499,31 +5598,20 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# 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. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6531,45 +5619,47 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -cat >>$CONFIG_STATUS <<\_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$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. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -6580,84 +5670,91 @@ Configuration commands: $config_commands -Report bugs to ." -_ACEOF +Report bugs to the package provider." -cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append 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.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; esac shift @@ -6671,43 +5768,55 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 -cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" PLATFORM=$PLATFORM _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "redhat/atftp.spec" ) CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "redhat/atftp.spec") CONFIG_FILES="$CONFIG_FILES redhat/atftp.spec" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -6719,728 +5828,575 @@ fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + tmp= + 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 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +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_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' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +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 + + 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 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} { - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi -# -# CONFIG_FILES section. -# +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@ISODATE@,$ISODATE,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@PLATFORM@,$PLATFORM,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t -s,@LIBPTHREAD@,$LIBPTHREAD,;t t -s,@LIBTERMCAP@,$LIBTERMCAP,;t t -s,@LIBREADLINE@,$LIBREADLINE,;t t -s,@LIBWRAP@,$LIBWRAP,;t t -s,@LIBPCRE@,$LIBPCRE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' 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: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# 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 + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/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: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$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 + +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' +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;} -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + -) 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 + ;; + :H) + # + # CONFIG_HEADER + # if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $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 + 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: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - cat $tmp/config.h - rm -f $tmp/config.h + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi -# Compute $ac_file's index in $config_headers. +# Compute "$ac_file"'s index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + "$ac_file" | "$ac_file":* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac +echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. @@ -7450,18 +6406,29 @@ # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -7489,66 +6456,54 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - default-1 ) + "default-1":C) outfile=PLATFORM tmpfile=${outfile} cat > $tmpfile << _EOF_ $PLATFORM _EOF_ ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF -{ (exit 0); exit 0; } +as_fn_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 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -7568,6 +6523,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 || { (exit 1); exit 1; } + $ac_cs_success || as_fn_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: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi --- atftp-0.7.dfsg.orig/tftpd.h +++ atftp-0.7.dfsg/tftpd.h @@ -44,8 +44,8 @@ /* multicast stuff */ short mc_port; /* multicast port */ char *mc_addr; /* multicast address */ - struct sockaddr_in sa_mcast; - struct ip_mreq mcastaddr; + struct sockaddr_storage sa_mcast; + union ip_mreq_storage mcastaddr; u_char mcast_ttl; /* @@ -69,7 +69,7 @@ }; struct client_info { - struct sockaddr_in client; + struct sockaddr_storage client; int done; /* that client as receive it's file */ struct client_info *next; }; @@ -99,7 +99,7 @@ void tftpd_clientlist_free(struct thread_data *thread); int tftpd_clientlist_done(struct thread_data *thread, struct client_info *client, - struct sockaddr_in *sock); + struct sockaddr_storage *sock); int tftpd_clientlist_next(struct thread_data *thread, struct client_info **client); void tftpd_list_kill_threads(void); --- atftp-0.7.dfsg.orig/logger.c +++ atftp-0.7.dfsg/logger.c @@ -56,7 +56,15 @@ log_ident = "unset"; if (filename) + { log_filename = strdup(filename); + if (!strcmp(filename, "-")) + { + log_fd = STDOUT_FILENO; + log_fp = fdopen(log_fd, "a"); + return; + } + } else { openlog(log_ident, LOG_PID, LOG_DAEMON); --- atftp-0.7.dfsg.orig/tftp_mtftp.c +++ atftp-0.7.dfsg/tftp_mtftp.c @@ -112,18 +112,20 @@ int data_size; /* size of data received */ int sockfd = data->sockfd; /* just to simplify calls */ int sock; - struct sockaddr_in sa; /* a copy of data.sa_peer */ - struct sockaddr_in from; + struct sockaddr_storage sa; /* a copy of data.sa_peer */ + struct sockaddr_storage from; + char from_str[SOCKADDR_PRINT_ADDR_LEN]; struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; FILE *fp = NULL; /* the local file pointer */ int number_of_timeout = 0; int timeout = 0; - struct in_addr mcast_addr; + struct sockaddr_storage sa_mcast_group; int mcast_sockfd = 0; - struct sockaddr_in sa_mcast; - struct ip_mreq mreq; - struct hostent *host; + struct sockaddr_storage sa_mcast; + union ip_mreq_storage mreq; + struct addrinfo hints, *addrinfo; + int err; int mode = LISTEN; unsigned int file_bitmap[NB_BLOCK]; @@ -132,13 +134,13 @@ data->file_size = 0; tftp_cancel = 0; - from.sin_addr.s_addr = 0; + memset(&from, 0, sizeof(from)); - memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); + memset(&sa_mcast, 0, sizeof(struct sockaddr_storage)); memset(&file_bitmap, 0, sizeof(file_bitmap)); /* make sure the socket is not connected */ - sa.sin_family = AF_UNSPEC; + sa.ss_family = AF_UNSPEC; connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); /* copy sa_peer structure */ @@ -170,13 +172,14 @@ } /* Configure multicast stuff, look up the host */ - host = gethostbyname(data->mtftp_mcast_ip); /* if valid, update s_inn structure */ - if (host) + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + if (!getaddrinfo(data->mtftp_mcast_ip, NULL, &hints, &addrinfo) && + !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) { - memcpy(&mcast_addr, host->h_addr_list[0], - host->h_length); - if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) + freeaddrinfo(addrinfo); + if (!sockaddr_is_multicast(&sa_mcast_group)) { fprintf(stderr, "mtftp: bad multicast address %s\n", @@ -196,9 +199,9 @@ perror("atftp: socket"); exit(1); } - sa_mcast.sin_family = AF_INET; - sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); - sa_mcast.sin_port = htons(data->mtftp_client_port); + memset(&sa_mcast, 0, sizeof(sa_mcast)); + sa_mcast.ss_family = sa_mcast_group.ss_family; + sockaddr_set_port(&sa, data->mtftp_client_port); if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, sizeof(sa_mcast)) < 0) @@ -206,13 +209,15 @@ perror("atftp: bind"); exit(1); } - - mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; - mreq.imr_interface.s_addr = htonl(INADDR_ANY); - - if (setsockopt(mcast_sockfd, IPPROTO_IP, - IP_ADD_MEMBERSHIP, - &mreq, sizeof(mreq)) < 0) + + sockaddr_get_mreq(&sa_mcast_group, &mreq); + if (sa_mcast_group.ss_family == AF_INET) + err = setsockopt(mcast_sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &mreq.v4, sizeof(mreq.v4)); + else + err = setsockopt(mcast_sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, + &mreq.v6, sizeof(mreq.v6)); + if (err < 0) { perror("atftp: setsockopt"); exit(1); @@ -228,7 +233,7 @@ #endif if (tftp_cancel) { - if (from.sin_addr.s_addr == 0) + if (from.ss_family == 0) state = S_ABORT; else { @@ -298,7 +303,7 @@ else state = S_WAIT_PACKET; - sa.sin_port = 0; /* must be set to 0 before the fist call to + sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to tftp_get_packet, but it was set before the call to tftp_send_request with the server port */ break; @@ -351,10 +356,10 @@ break; } /* Can only receive this error from unicast */ - if (sa.sin_addr.s_addr != from.sin_addr.s_addr) + if (!sockaddr_equal_addr(&sa, &from)) { fprintf(stderr, "mtftp: error packet discarded from <%s>.\n", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, from_str, sizeof(from_str))); break; } /* packet is for us */ @@ -367,7 +372,7 @@ /* Specification state that server source IP must matches, but port is not a requierement (anyway we may not know the source port yet) */ - if (sa.sin_addr.s_addr == from.sin_addr.s_addr) + if (sockaddr_equal_addr(&sa, &from)) { if (mode != LISTEN) { @@ -380,7 +385,7 @@ fprintf(stderr, "mtftp: unexpected unicast packet from <%s>," " continuing\n", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, from_str, sizeof(from_str))); else mode = RECEIVE; } @@ -404,7 +409,7 @@ { fprintf(stderr, "mtftp: unexpected unicast packet from <%s>.\n", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, from_str, sizeof(from_str))); break; } } @@ -412,7 +417,7 @@ else { fprintf(stderr, "mtftp: unexpected packet from <%s>\n", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, from_str, sizeof(from_str))); break; } number_of_timeout = 0; @@ -424,7 +429,7 @@ mcast IP or port */ number_of_timeout++; fprintf(stderr, "mtftp: packet discard <%s>.\n", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, from_str, sizeof(from_str))); if (number_of_timeout > NB_OF_RETRY) state = S_ABORT; break; @@ -495,9 +500,15 @@ if (fp) fclose(fp); /* drop multicast membership */ - if (setsockopt(mcast_sockfd, IPPROTO_IP, - IP_DROP_MEMBERSHIP, - &mreq, sizeof(mreq)) < 0) + if (sa_mcast_group.ss_family == AF_INET) + err = setsockopt(mcast_sockfd, IPPROTO_IP, + IP_DROP_MEMBERSHIP, + &mreq.v4, sizeof(mreq.v4)); + else + err = setsockopt(mcast_sockfd, IPPROTO_IPV6, + IPV6_DROP_MEMBERSHIP, + &mreq.v6, sizeof(mreq.v6)); + if (err < 0) { perror("setsockopt"); exit(1); --- atftp-0.7.dfsg.orig/tftpd_mtftp.c +++ atftp-0.7.dfsg/tftpd_mtftp.c @@ -74,7 +74,7 @@ int line = 0; struct stat file_stat; - struct hostent host; + struct addrinfo hints, *addrinfo; /* open file */ if ((fp = fopen(filename, "r")) == NULL) @@ -208,13 +208,15 @@ continue; } /* verify IP is valid */ - if (Gethostbyname(thread->mcast_ip, &host) == OK) + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + if (!getaddrinfo(thread->mcast_ip, thread->client_port, + &hints, &addrinfo) && + !sockaddr_set_addrinfo(&thread->sa_mcast, addrinfo)) { - thread->sa_mcast.sin_family = host.h_addrtype; - memcpy(&thread->sa_mcast.sin_addr.s_addr, - host.h_addr_list[0], host.h_length); - thread->sa_mcast.sin_port = htons(thread->mcast_port); - if (!IN_MULTICAST(ntohl(thread->sa_mcast.sin_addr.s_addr))) + thread->mcast_port = sockaddr_get_port(&thread->sa_mcast); + freeaddrinfo(addrinfo); + if (!sockaddr_is_multicast(&thread->sa_mcast)) { logger(LOG_WARNING, "mtftp: bad multicast address %s\n", thread->mcast_ip); @@ -345,11 +347,9 @@ struct mtftp_thread *thread; int sockfd; - struct sockaddr_in sa; + struct sockaddr_storage sa; socklen_t len = sizeof(struct sockaddr); -#ifdef HAVE_WRAP - char client_addr[16]; -#endif + char addr_str[SOCKADDR_PRINT_ADDR_LEN]; int retval; /* hold return value for testing */ int data_size; /* returned size by recvfrom */ char filename[MAXLEN]; @@ -357,14 +357,13 @@ logger(LOG_NOTICE, "mtftp main server thread started"); - /* initialise sockaddr_in structure */ + /* initialise sockaddr_storage structure */ memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_addr.s_addr = htonl(INADDR_ANY); - sa.sin_port = htons(data->server_port); + sa.ss_family = AF_INET; /* FIXME */ + sockaddr_set_port(&sa, data->server_port); /* open the socket */ - if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) + if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) { logger(LOG_ERR, "mtftp: can't open socket"); pthread_exit(NULL); @@ -396,12 +395,11 @@ #ifdef HAVE_WRAP /* Verify the client has access. We don't look for the name but rely only on the IP address for that. */ - inet_ntop(AF_INET, &sa.sin_addr, - client_addr, sizeof(client_addr)); - if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, + sockaddr_print_addr(&sa, addr_str, sizeof(addr_str)); + if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, STRING_UNKNOWN) == 0) { - logger(LOG_ERR, "mtftp: connection refused from %s", client_addr); + logger(LOG_ERR, "mtftp: connection refused from %s", addr_str); continue; } #endif @@ -415,7 +413,8 @@ if (retval != GET_RRQ) { logger(LOG_WARNING, "unsupported request <%d> from %s", - retval, inet_ntoa(sa.sin_addr)); + retval, + sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); tftp_send_error(sockfd, &sa, EBADOP, data->data_buffer, data->data_buffer_size); if (data->trace) logger(LOG_DEBUG, "sent ERROR ", EBADOP, @@ -425,7 +424,7 @@ else { logger(LOG_NOTICE, "Serving %s to %s:%d", filename, - inet_ntoa(sa.sin_addr), ntohs(sa.sin_port)); + sockaddr_print_addr(&sa, addr_str, sizeof(addr_str))); if (data->trace) logger(LOG_DEBUG, "received RRQ <%s>", string); } @@ -453,7 +452,7 @@ continue; } /* copy client info for server */ - memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_in)); + memcpy(&thread->sa_in, &sa, sizeof(struct sockaddr_storage)); /* open a socket for client communication */ if ((thread->sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) { @@ -462,7 +461,7 @@ } getsockname(sockfd, (struct sockaddr *)&(sa), &len); //memset(&sa, 0, sizeof(sa)); - sa.sin_port = 0; + sockaddr_set_port(&sa, 0); /* bind the socket to the tftp port */ if (bind(thread->sockfd, (struct sockaddr*)&sa, sizeof(sa)) < 0) { @@ -472,10 +471,13 @@ getsockname(thread->sockfd, (struct sockaddr *)&(sa), &len); /* configure multicast socket */ - thread->mcastaddr.imr_multiaddr.s_addr = thread->sa_mcast.sin_addr.s_addr; - thread->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); - setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, - &data->mcast_ttl, sizeof(data->mcast_ttl)); + sockaddr_get_mreq(&thread->sa_mcast, &thread->mcastaddr); + if (thread->sa_mcast.ss_family == AF_INET) + setsockopt(thread->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, + &data->mcast_ttl, sizeof(data->mcast_ttl)); + else + setsockopt(thread->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + &data->mcast_ttl, sizeof(data->mcast_ttl)); /* give server thread access to mtftp options */ thread->mtftp_data = data; @@ -511,8 +513,9 @@ int data_size; struct mtftp_thread *data = (struct mtftp_thread *)arg; - struct sockaddr_in *sa = &data->sa_in; - struct sockaddr_in from; + struct sockaddr_storage *sa = &data->sa_in; + struct sockaddr_storage from; + char addr_str[SOCKADDR_PRINT_ADDR_LEN]; int sockfd = data->sockfd; struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; @@ -591,7 +594,8 @@ if (number_of_timeout > NB_OF_RETRY) { logger(LOG_INFO, "client (%s) not responding", - inet_ntoa(data->sa_in.sin_addr)); + sockaddr_print_addr(&data->sa_in, addr_str, + sizeof(addr_str))); state = S_END; break; } @@ -599,14 +603,13 @@ state = timeout_state; break; case GET_ACK: - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { logger(LOG_WARNING, "packet discarded"); break; } /* handle case where packet come from un unexpected client */ - if ((sa->sin_port == from.sin_port) && - (sa->sin_addr.s_addr == from.sin_addr.s_addr)) + if (sockaddr_equal(sa, &from)) { /* The ACK is from the exected client */ number_of_timeout = 0; @@ -623,14 +626,13 @@ } break; case GET_ERROR: - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { logger(LOG_WARNING, "packet discarded"); break; } /* handle case where packet come from un unexpected client */ - if ((sa->sin_port == from.sin_port) && - (sa->sin_addr.s_addr == from.sin_addr.s_addr)) + if (sockaddr_equal(sa, &from)) { /* Got an ERROR from the current master client */ Strncpy(string, tftphdr->th_msg, --- atftp-0.7.dfsg.orig/config.h.in +++ atftp-0.7.dfsg/config.h.in @@ -138,6 +138,9 @@ /* 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 @@ -150,18 +153,43 @@ /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME -/* Version number of package */ -#undef VERSION - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t --- atftp-0.7.dfsg.orig/tftp.h +++ atftp-0.7.dfsg/tftp.h @@ -39,8 +39,8 @@ char hostname[MAXLEN]; /* peer's hostname */ short port; /* tftp port for the server, 69 by default */ - struct sockaddr_in sa_peer; /* peer address and port */ - struct sockaddr_in sa_local; /* local address and port */ + struct sockaddr_storage sa_peer; /* peer address and port */ + struct sockaddr_storage sa_local; /* local address and port */ int sockfd; int connected; /* we are 'connected' */ --- atftp-0.7.dfsg.orig/tftpd_pcre.c +++ atftp-0.7.dfsg/tftpd_pcre.c @@ -211,9 +211,9 @@ chp++; /* point to value indicating substring */ rc = pcre_get_substring(str, ovector, matches, *chp - 0x30, &tmpstr); /* found string */ - if (rc > 0) + if (rc > 0 && outchp - outstr + rc+1 < outsize) { - Strncpy(outchp, tmpstr, rc); + Strncpy(outchp, tmpstr, rc+1); outchp += rc; pcre_free_substring(tmpstr); continue; --- atftp-0.7.dfsg.orig/PLATFORM +++ atftp-0.7.dfsg/PLATFORM @@ -0,0 +1 @@ +pc-i686-linux-gnu --- atftp-0.7.dfsg.orig/Makefile.am +++ atftp-0.7.dfsg/Makefile.am @@ -16,6 +16,7 @@ DIST_SUBDIRS = $(SUBDIRS) CLEANFILES = *~ DISTCLEANFILES = libtool config.status +AM_CPPFLAGS = -D_GNU_SOURCE man_MANS = atftp.1 atftpd.8 dist_scripts = autogen.sh @@ -32,7 +33,7 @@ argz.c tftp_mtftp.c sbin_PROGRAMS = atftpd -atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) +atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ tftpd_mtftp.c --- atftp-0.7.dfsg.orig/tftpd_file.c +++ atftp-0.7.dfsg/tftpd_file.c @@ -110,8 +110,9 @@ int block_number = 0; int data_size; int sockfd = data->sockfd; - struct sockaddr_in *sa = &data->client_info->client; - struct sockaddr_in from; + struct sockaddr_storage *sa = &data->client_info->client; + struct sockaddr_storage from; + char addr_str[SOCKADDR_PRINT_ADDR_LEN]; struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; FILE *fp; char filename[MAXLEN]; @@ -269,7 +270,8 @@ if (number_of_timeout > NB_OF_RETRY) { logger(LOG_INFO, "client (%s) not responding", - inet_ntoa(data->client_info->client.sin_addr)); + sockaddr_print_addr(&data->client_info->client, + addr_str, sizeof(addr_str))); state = S_END; } else @@ -290,12 +292,13 @@ * **** test since the port number is the TID. Use this * **** only if you know what you're doing. */ - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { if (data->checkport) { logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); break; } else @@ -311,12 +314,13 @@ break; case GET_DATA: /* Check that source port match */ - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { if (data->checkport) { logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); break; } else @@ -328,7 +332,8 @@ case GET_DISCARD: /* FIXME: should we increment number_of_timeout */ logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); break; case ERR: logger(LOG_ERR, "%s: %d: recvfrom: %s", @@ -405,8 +410,9 @@ int block_number = 0; int last_block = -1; int data_size; - struct sockaddr_in *sa = &data->client_info->client; - struct sockaddr_in from; + struct sockaddr_storage *sa = &data->client_info->client; + struct sockaddr_storage from; + char addr_str[SOCKADDR_PRINT_ADDR_LEN]; int sockfd = data->sockfd; struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; FILE *fp; @@ -618,6 +624,8 @@ } else { + struct addrinfo hints, *result; + /* configure socket, get an IP address */ if (tftpd_mcast_get_tid(&data->mc_addr, &data->mc_port) != OK) { @@ -629,29 +637,37 @@ data->mc_addr, data->mc_port); /* convert address */ - if (inet_aton(data->mc_addr, &data->sa_mcast.sin_addr) == 0) + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_NUMERICHOST; + if (getaddrinfo(data->mc_addr, NULL, &hints, &result) || + sockaddr_set_addrinfo(&data->sa_mcast, result)) { logger(LOG_ERR, "bad address %s\n",data->mc_addr); fclose(fp); return ERR; } - data->sa_mcast.sin_family = AF_INET; /* FIXME: IPv6 */ - data->sa_mcast.sin_port = htons(data->mc_port); + freeaddrinfo(result); + sockaddr_set_port(&data->sa_mcast, data->mc_port); + /* verify address is multicast */ - if (!IN_MULTICAST(ntohl(data->sa_mcast.sin_addr.s_addr))) + if (!sockaddr_is_multicast(&data->sa_mcast)) { logger(LOG_ERR, "bad multicast address %s\n", - inet_ntoa(data->sa_mcast.sin_addr)); + sockaddr_print_addr(&data->sa_mcast, + addr_str, sizeof(addr_str))); fclose(fp); return ERR; } /* initialise multicast address structure */ - data->mcastaddr.imr_multiaddr.s_addr = - data->sa_mcast.sin_addr.s_addr; - data->mcastaddr.imr_interface.s_addr = htonl(INADDR_ANY); - setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, - &data->mcast_ttl, sizeof(data->mcast_ttl)); + sockaddr_get_mreq(&data->sa_mcast, &data->mcastaddr); + if (data->sa_mcast.ss_family == AF_INET) + setsockopt(data->sockfd, IPPROTO_IP, IP_MULTICAST_TTL, + &data->mcast_ttl, sizeof(data->mcast_ttl)); + else + setsockopt(data->sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + &data->mcast_ttl, sizeof(data->mcast_ttl)); /* set options data for OACK */ opt_set_multicast(data->tftp_options, data->mc_addr, @@ -660,8 +676,8 @@ data->mc_port, 1); /* the socket must be unconnected for multicast */ - sa->sin_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)sa, sizeof(sa)); + sa->ss_family = AF_UNSPEC; + connect(sockfd, (struct sockaddr *)sa, sizeof(*sa)); /* set multicast flag */ multicast = 1; @@ -689,7 +705,9 @@ if (data->trace) { logger(LOG_DEBUG, "sent ERROR to %s", EUNDEF, - tftp_errmsg[EUNDEF], inet_ntoa(client_info->client.sin_addr)); + tftp_errmsg[EUNDEF], + sockaddr_print_addr(&client_info->client, + addr_str, sizeof(addr_str))); } } while (tftpd_clientlist_next(data, &client_info) == 1); state = S_ABORT; @@ -751,7 +769,8 @@ if (number_of_timeout > NB_OF_RETRY) { logger(LOG_INFO, "client (%s) not responding", - inet_ntoa(client_info->client.sin_addr)); + sockaddr_print_addr(&client_info->client, + addr_str, sizeof(addr_str))); state = S_END; } else @@ -780,8 +799,11 @@ going to OACK state */ logger(LOG_INFO, "Serving next client: %s:%d", - inet_ntoa(client_info->client.sin_addr), - ntohs(client_info->client.sin_port)); + sockaddr_print_addr( + &client_info->client, + addr_str, sizeof(addr_str)), + sockaddr_get_port( + &client_info->client)); sa = &client_info->client; state = S_SEND_OACK; break; @@ -804,8 +826,7 @@ /* handle case where packet come from un unexpected client */ if (multicast) { - if ((sa->sin_port != from.sin_port) || - (sa->sin_addr.s_addr != from.sin_addr.s_addr)) + if (!sockaddr_equal(sa, &from)) { /* We got an ACK from a client that is not the master client. * If this is an ACK for the last block, mark this client as @@ -815,10 +836,15 @@ { if (tftpd_clientlist_done(data, NULL, &from) == 1) logger(LOG_DEBUG, "client done <%s>", - inet_ntoa(client_info->client.sin_addr)); + sockaddr_print_addr( + &from, addr_str, + sizeof(addr_str))); else logger(LOG_WARNING, "packet discarded <%s:%d>", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); + sockaddr_print_addr( + &from, addr_str, + sizeof(addr_str)), + sockaddr_get_port(&from)); } else /* If not, send and OACK with mc=0 to shut it up. */ @@ -837,12 +863,14 @@ else { /* check that the packet is from the current client */ - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { if (data->checkport) { logger(LOG_WARNING, "packet discarded <%s:%d>", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str)), + sockaddr_get_port(&from)); break; } else @@ -868,19 +896,21 @@ if (multicast) { /* if packet is not from the current master client */ - if ((sa->sin_port != from.sin_port) || - (sa->sin_addr.s_addr != from.sin_addr.s_addr)) + if (!sockaddr_equal(sa, &from)) { /* mark this client done */ if (tftpd_clientlist_done(data, NULL, &from) == 1) { if (data->trace) logger(LOG_DEBUG, "client sent ERROR, mark as done <%s>", - inet_ntoa(client_info->client.sin_addr)); + sockaddr_print_addr( + &from, addr_str, + sizeof(addr_str))); } else logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); /* current state is unchanged */ break; } @@ -888,12 +918,13 @@ else { /* check that the packet is from the current client */ - if (sa->sin_port != from.sin_port) + if (sockaddr_get_port(sa) != sockaddr_get_port(&from)) { if (data->checkport) { logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); break; } else @@ -919,7 +950,8 @@ case GET_DISCARD: /* FIXME: should we increment number_of_timeout */ logger(LOG_WARNING, "packet discarded <%s>", - inet_ntoa(from.sin_addr)); + sockaddr_print_addr(&from, addr_str, + sizeof(addr_str))); break; case ERR: logger(LOG_ERR, "%s: %d: recvfrom: %s", @@ -944,8 +976,9 @@ { logger(LOG_INFO, "Serving next client: %s:%d", - inet_ntoa(client_info->client.sin_addr), - ntohs(client_info->client.sin_port)); + sockaddr_print_addr(&client_info->client, + addr_str, sizeof(addr_str)), + sockaddr_get_port(&client_info->client)); /* client is a new client structure */ sa = &client_info->client; /* nedd to send an oack to that client */ --- atftp-0.7.dfsg.orig/config.guess +++ atftp-0.7.dfsg/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2004-01-05' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -196,53 +200,32 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -280,45 +263,49 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -326,32 +313,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -360,10 +347,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -375,10 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -389,37 +376,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -443,32 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -484,29 +475,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -514,7 +505,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -529,15 +520,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -550,28 +545,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -633,9 +628,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +648,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,163 +680,192 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -848,8 +882,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -867,15 +905,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -889,7 +934,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -897,25 +942,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -933,15 +984,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -958,7 +1009,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -968,16 +1019,23 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -985,27 +1043,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1013,15 +1071,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1113,68 +1172,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1182,22 +1254,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1208,31 +1283,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; - *:DRAGONFLY:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1264,7 +1355,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1353,11 +1444,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1366,22 +1458,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1392,7 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- atftp-0.7.dfsg.orig/tftp_io.h +++ atftp-0.7.dfsg/tftp_io.h @@ -39,18 +39,18 @@ #define GET_DATA 7 /* functions prototype */ -int tftp_send_request(int socket, struct sockaddr_in *s_inn, short type, +int tftp_send_request(int socket, struct sockaddr_storage *s_inn, short type, char *data_buffer, int data_buffer_size, struct tftp_opt *tftp_options); -int tftp_send_ack(int socket, struct sockaddr_in *s_inn, short block_number); -int tftp_send_oack(int socket, struct sockaddr_in *s_inn, struct tftp_opt *tftp_options, +int tftp_send_ack(int socket, struct sockaddr_storage *s_inn, short block_number); +int tftp_send_oack(int socket, struct sockaddr_storage *s_inn, struct tftp_opt *tftp_options, char *buffer, int buffer_size); -int tftp_send_error(int socket, struct sockaddr_in *s_inn, short err_code, +int tftp_send_error(int socket, struct sockaddr_storage *s_inn, short err_code, char *buffer, int buffer_size); -int tftp_send_data(int socket, struct sockaddr_in *s_inn, short block_number, +int tftp_send_data(int socket, struct sockaddr_storage *s_inn, short block_number, int size, char *data); -int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, - struct sockaddr_in *from, struct sockaddr_in *to, +int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, + struct sockaddr_storage *from, struct sockaddr_storage *to, int timeout, int *size, char *data); int tftp_file_read(FILE *fp, char *buffer, int buffer_size, int block_number, int convert, int *prev_block_number, int *prev_file_pos, int *temp); --- atftp-0.7.dfsg.orig/tftpd_mtftp.h +++ atftp-0.7.dfsg/tftpd_mtftp.h @@ -57,13 +57,13 @@ FILE *fp; int sockfd; - struct sockaddr_in sa_in; - struct sockaddr_in sa_client; + struct sockaddr_storage sa_in; + struct sockaddr_storage sa_client; int mcast_sockfd; int mcast_port; - struct sockaddr_in sa_mcast; - struct ip_mreq mcastaddr; + struct sockaddr_storage sa_mcast; + union ip_mreq_storage mcastaddr; char *data_buffer; int data_buffer_size; --- atftp-0.7.dfsg.orig/tftp.c +++ atftp-0.7.dfsg/tftp.c @@ -354,7 +354,7 @@ void make_arg(char *string, int *argc, char ***argv) { static char *tmp = NULL; - int argz_len; + size_t argz_len; /* split the string to an argz vector */ if (argz_create_sep(string, ' ', &tmp, &argz_len) != 0) @@ -408,8 +408,8 @@ */ int set_peer(int argc, char **argv) { - struct hostent *host; /* for host name lookup */ - struct servent *sp; /* server entry for tftp service */ + struct addrinfo hints, *addrinfo; + int err; /* sanity check */ if ((argc < 2) || (argc > 3)) @@ -418,47 +418,40 @@ return ERR; } - /* get the server entry */ - sp = getservbyname("tftp", "udp"); - if (sp == 0) { - fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); - return ERR; - } - - /* look up the host */ - host = gethostbyname(argv[1]); + /* look up the service and host */ + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_CANONNAME; + err = getaddrinfo(argv[1], argc == 3 ? argv[2] : "tftp", + &hints, &addrinfo); /* if valid, update s_inn structure */ - if (host) + if (err == 0) + err = sockaddr_set_addrinfo(&data.sa_peer, addrinfo); + if (err == 0) { - data.sa_peer.sin_family = host->h_addrtype; - if (host->h_length > sizeof(data.sa_peer.sin_addr)) - host->h_length = sizeof(data.sa_peer.sin_addr); - memcpy(&data.sa_peer.sin_addr, host->h_addr, host->h_length); - Strncpy(data.hostname, host->h_name, + Strncpy(data.hostname, addrinfo->ai_canonname, sizeof(data.hostname)); data.hostname[sizeof(data.hostname)-1] = 0; - data.sa_peer.sin_port = sp->s_port; + freeaddrinfo(addrinfo); } else { - fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); - data.connected = 0; - return ERR; - } - /* get the server port */ - if (argc == 3) - { - sp->s_port = htons(atoi(argv[2])); - if (sp->s_port < 0) + if (err == EAI_SERVICE) { - fprintf(stderr, "%s: bad port number.\n", argv[2]); - data.connected = 0; - return ERR; + if (argc == 3) + fprintf(stderr, "%s: bad port number.\n", argv[2]); + else + fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); + } + else + { + fprintf(stderr, "tftp: unknown host %s.\n", argv[1]); } - data.sa_peer.sin_port = sp->s_port; + data.connected = 0; + return ERR; } /* copy port number to data structure */ - data.port = ntohs(sp->s_port); + data.port = sockaddr_get_port(&data.sa_peer); data.connected = 1; return OK; @@ -602,7 +595,7 @@ } /* open a UDP socket */ - data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); + data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); if (data.sockfd < 0) { perror("tftp: "); exit(ERR); @@ -706,7 +699,7 @@ } /* open a UDP socket */ - data.sockfd = socket(AF_INET, SOCK_DGRAM, 0); + data.sockfd = socket(data.sa_peer.ss_family, SOCK_DGRAM, 0); if (data.sockfd < 0) { perror("tftp: "); exit(ERR); @@ -731,7 +724,7 @@ fsync(data.sockfd); close(data.sockfd); - return OK; + return tftp_result; } #ifdef HAVE_MTFTP --- atftp-0.7.dfsg.orig/tftp_file.c +++ atftp-0.7.dfsg/tftp_file.c @@ -59,7 +59,7 @@ unsigned int next_word; /* initial stuff */ - next_hole = prev_hole + 1; + next_hole = 0; /*prev_hole + 1;*/ next_word_no = next_hole / 32; next_bit_no = next_hole % 32; next_word = bitmap[next_word_no]; @@ -117,8 +117,9 @@ int last_block_number = -1;/* block number of last block for multicast */ int data_size; /* size of data received */ int sockfd = data->sockfd; /* just to simplify calls */ - struct sockaddr_in sa; /* a copy of data.sa_peer */ - struct sockaddr_in from; + struct sockaddr_storage sa; /* a copy of data.sa_peer */ + struct sockaddr_storage from; + char from_str[SOCKADDR_PRINT_ADDR_LEN]; int connected; /* 1 when sockfd is connected */ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; FILE *fp = NULL; /* the local file pointer */ @@ -129,11 +130,11 @@ int multicast = 0; /* set to 1 if multicast */ int mc_port; /* multicast port */ char mc_addr[IPADDRLEN]; /* multicast address */ - struct in_addr mcast_addr; int mcast_sockfd = 0; - struct sockaddr_in sa_mcast; - struct ip_mreq mreq; - struct hostent *host; + struct addrinfo hints, *addrinfo; + struct sockaddr_storage sa_mcast_group; + struct sockaddr_storage sa_mcast; + union ip_mreq_storage mreq; int master_client = 0; unsigned int file_bitmap[NB_BLOCK]; int prev_bitmap_hole = -1; /* the previous hole found in the bitmap */ @@ -141,16 +142,17 @@ int prev_block_number = 0; /* needed to support netascii convertion */ int temp = 0; + int err; data->file_size = 0; tftp_cancel = 0; - from.sin_addr.s_addr = 0; - memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); + memset(&from, 0, sizeof(from)); + memset(&sa_mcast_group, 0, sizeof(sa_mcast_group)); memset(&file_bitmap, 0, sizeof(file_bitmap)); /* make sure the socket is not connected */ - sa.sin_family = AF_UNSPEC; + sa.ss_family = AF_UNSPEC; connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); connected = 0; @@ -190,7 +192,7 @@ #endif if (tftp_cancel) { - if (from.sin_addr.s_addr == 0) + if (from.ss_family == 0) state = S_ABORT; else { @@ -217,7 +219,7 @@ string); } - sa.sin_port = data->sa_peer.sin_port; + sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); /* send request packet */ if (tftp_send_request(sockfd, &sa, RRQ, data->data_buffer, data->data_buffer_size, @@ -225,7 +227,7 @@ state = S_ABORT; else state = S_WAIT_PACKET; - sa.sin_port = 0; /* must be set to 0 before the fist call to + sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to tftp_get_packet, but is was set before the call to tftp_send_request */ break; @@ -256,8 +258,7 @@ data->data_buffer); /* RFC2090 state we should verify source address as well as source port */ - if ((sa.sin_addr.s_addr != from.sin_addr.s_addr) || - (sa.sin_port != from.sin_port)) + if (!sockaddr_equal(&sa, &from)) { result = GET_DISCARD; fprintf(stderr, "source address or port mismatch\n"); @@ -269,7 +270,7 @@ data->timeout, &data_size, data->data_buffer); /* Check that source port match */ - if ((sa.sin_port != from.sin_port) && + if ((sockaddr_get_port(&sa) != sockaddr_get_port(&from)) && ((result == GET_OACK) || (result == GET_ERROR) || (result == GET_DATA))) { @@ -324,7 +325,8 @@ lock up when doing multicast transfer and routing is broken */ number_of_timeout++; fprintf(stderr, "tftp: packet discard <%s:%d>.\n", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); + sockaddr_print_addr(&from, from_str, sizeof(from_str)), + sockaddr_get_port(&from)); if (number_of_timeout > NB_OF_RETRY) state = S_ABORT; break; @@ -457,19 +459,20 @@ fprintf(stderr, "multicast: %s,%d,%d, ", mc_addr, mc_port, master_client); /* look up the host */ - host = gethostbyname(mc_addr); /* if valid, update s_inn structure */ - if (host) + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + if (!getaddrinfo(mc_addr, NULL, &hints, &addrinfo) && + !sockaddr_set_addrinfo(&sa_mcast_group, addrinfo)) { - memcpy(&mcast_addr, host->h_addr_list[0], - host->h_length); - if (!IN_MULTICAST(ntohl(mcast_addr.s_addr))) + if (!sockaddr_is_multicast(&sa_mcast_group)) { fprintf(stderr, "atftp: bad multicast address %s\n", mc_addr); exit(1); } + freeaddrinfo(addrinfo); } else { @@ -478,12 +481,13 @@ exit(1); } /* we need to open a new socket for multicast */ - if ((mcast_sockfd = socket(AF_INET, SOCK_DGRAM, 0))<0) + if ((mcast_sockfd = socket(sa_mcast_group.ss_family, + SOCK_DGRAM, 0))<0) exit(1); - sa_mcast.sin_family = AF_INET; - sa_mcast.sin_addr.s_addr = htonl(INADDR_ANY); - sa_mcast.sin_port = htons(mc_port); + memset(&sa_mcast, 0, sizeof(sa_mcast)); + sa_mcast.ss_family = sa_mcast_group.ss_family; + sockaddr_set_port(&sa_mcast, mc_port); if (bind(mcast_sockfd, (struct sockaddr *)&sa_mcast, sizeof(sa_mcast)) < 0) @@ -492,12 +496,16 @@ exit(1); } - mreq.imr_multiaddr.s_addr = mcast_addr.s_addr; - mreq.imr_interface.s_addr = htonl(INADDR_ANY); - - if (setsockopt(mcast_sockfd, IPPROTO_IP, - IP_ADD_MEMBERSHIP, - &mreq, sizeof(mreq)) < 0) + sockaddr_get_mreq(&sa_mcast_group, &mreq); + if (sa_mcast_group.ss_family == AF_INET) + err = setsockopt(mcast_sockfd, IPPROTO_IP, + IP_ADD_MEMBERSHIP, + &mreq.v4, sizeof(mreq.v4)); + else + err = setsockopt(mcast_sockfd, IPPROTO_IPV6, + IPV6_ADD_MEMBERSHIP, + &mreq.v6, sizeof(mreq.v6)); + if (err < 0) { perror("setsockopt"); exit(1); @@ -563,9 +571,15 @@ /* drop multicast membership */ if (multicast) { - if (setsockopt(mcast_sockfd, IPPROTO_IP, - IP_DROP_MEMBERSHIP, - &mreq, sizeof(mreq)) < 0) + if (sa_mcast_group.ss_family == AF_INET) + err = setsockopt(mcast_sockfd, IPPROTO_IP, + IP_DROP_MEMBERSHIP, + &mreq.v4, sizeof(mreq.v4)); + else + err = setsockopt(mcast_sockfd, IPPROTO_IPV6, + IPV6_DROP_MEMBERSHIP, + &mreq.v6, sizeof(mreq.v6)); + if (err < 0) { perror("setsockopt"); exit(1); @@ -608,8 +622,9 @@ int last_block = -1; int data_size; /* size of data received */ int sockfd = data->sockfd; /* just to simplify calls */ - struct sockaddr_in sa; /* a copy of data.sa_peer */ - struct sockaddr_in from; + struct sockaddr_storage sa; /* a copy of data.sa_peer */ + struct sockaddr_storage from; + char from_str[SOCKADDR_PRINT_ADDR_LEN]; int connected; /* 1 when sockfd is connected */ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; FILE *fp; /* the local file pointer */ @@ -624,10 +639,10 @@ data->file_size = 0; tftp_cancel = 0; - from.sin_addr.s_addr = 0; + memset(&from, 0, sizeof(from)); /* make sure the socket is not connected */ - sa.sin_family = AF_UNSPEC; + sa.ss_family = AF_UNSPEC; connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); connected = 0; @@ -674,7 +689,7 @@ if (tftp_cancel) { /* Make sure we know the peer's address */ - if (from.sin_addr.s_addr == 0) + if (from.ss_family == 0) state = S_ABORT; else { @@ -701,7 +716,7 @@ string); } - sa.sin_port = data->sa_peer.sin_port; + sockaddr_set_port(&sa, sockaddr_get_port(&data->sa_peer)); /* send request packet */ if (tftp_send_request(sockfd, &sa, WRQ, data->data_buffer, data->data_buffer_size, @@ -709,7 +724,7 @@ state = S_ABORT; else state = S_WAIT_PACKET; - sa.sin_port = 0; /* must be set to 0 before the fist call to + sockaddr_set_port(&sa, 0); /* must be set to 0 before the fist call to tftp_get_packet, but is was set before the call to tftp_send_request */ break; @@ -736,7 +751,7 @@ data->timeout, &data_size, data->data_buffer); /* check that source port match */ - if (sa.sin_port != from.sin_port) + if (sockaddr_get_port(&sa) != sockaddr_get_port(&from)) { if ((data->checkport) && ((result == GET_ACK) || (result == GET_OACK) || @@ -796,7 +811,8 @@ if routing is broken */ number_of_timeout++; fprintf(stderr, "tftp: packet discard <%s:%d>.\n", - inet_ntoa(from.sin_addr), ntohs(from.sin_port)); + sockaddr_print_addr(&from, from_str, sizeof(from_str)), + sockaddr_get_port(&from)); if (number_of_timeout > NB_OF_RETRY) state = S_ABORT; break; --- atftp-0.7.dfsg.orig/atftpd.8 +++ atftp-0.7.dfsg/atftpd.8 @@ -84,8 +84,9 @@ used to run the server) must have permissions on the given file. Assuming the file is /var/log/atftpd.log, simply run: "touch /var/log/atftpd.log" and then "chown nobody.nogroup -/var/log/atftpd.log". When the server is ran in daemon mode, -/dev/stdout or /dev/stderr can be used. +/var/log/atftpd.log". When the server is run in daemon mode, +/dev/stdout or /dev/stderr can be used. Specifying a single dash as +the filename will send logs to stdout (file descriptor 1). .TP .B \-\-pidfile --- atftp-0.7.dfsg.orig/tftp_def.h +++ atftp-0.7.dfsg/tftp_def.h @@ -40,7 +40,7 @@ #define OPT_TIMEOUT 3 #define OPT_BLKSIZE 4 #define OPT_MULTICAST 5 -#define OPT_NUMBER 7 +#define OPT_NUMBER 6 #define OPT_SIZE 12 #define VAL_SIZE MAXLEN @@ -52,4 +52,25 @@ inline char *Strncpy(char *to, const char *from, size_t size); int Gethostbyname(char *addr, struct hostent *host); +char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t); +#define SOCKADDR_PRINT_ADDR_LEN INET6_ADDRSTRLEN +uint16_t sockaddr_get_port(const struct sockaddr_storage *); +void sockaddr_set_port(struct sockaddr_storage *, uint16_t); +int sockaddr_equal(const struct sockaddr_storage *, + const struct sockaddr_storage *); +int sockaddr_equal_addr(const struct sockaddr_storage *, + const struct sockaddr_storage *); +int sockaddr_is_multicast(const struct sockaddr_storage *); + +union ip_mreq_storage +{ + struct ip_mreq v4; + struct ipv6_mreq v6; +}; +void +sockaddr_get_mreq(const struct sockaddr_storage *, union ip_mreq_storage *); + +int +sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai); + #endif --- atftp-0.7.dfsg.orig/configure.ac +++ atftp-0.7.dfsg/configure.ac @@ -62,6 +62,7 @@ dnl Check for programs AC_PROG_CC +AC_GNU_SOURCE dnl Check for AIX AC_AIX --- atftp-0.7.dfsg.orig/Makefile.in +++ atftp-0.7.dfsg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -68,7 +68,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = redhat/atftp.spec -am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) @@ -230,7 +230,7 @@ atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ argz.c tftp_mtftp.c -atftpd_LDADD = $(LIBPTHREAD) $(LIBWRAP) $(LIBPCRE) +atftpd_LDADD = $(LIBWRAP) $(LIBPTHREAD) $(LIBPCRE) atftpd_SOURCES = tftpd.c logger.c options.c stats.c tftp_io.c tftp_def.c \ tftpd_file.c tftpd_list.c tftpd_mcast.c argz.c tftpd_pcre.c \ tftpd_mtftp.c @@ -294,14 +294,14 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -309,22 +309,22 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(sbindir) + test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -332,8 +332,8 @@ @$(NORMAL_UNINSTALL) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ - rm -f $(DESTDIR)$(sbindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ done clean-sbinPROGRAMS: @@ -385,7 +385,7 @@ uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -404,8 +404,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -425,12 +425,12 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(man8dir) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -449,8 +449,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ done uninstall-man8: @$(NORMAL_UNINSTALL) @@ -470,8 +470,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ - rm -f $(DESTDIR)$(man8dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -547,14 +547,16 @@ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -564,9 +566,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -678,7 +682,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -701,7 +705,7 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkdir_p) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ @@ -738,7 +742,9 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive --- atftp-0.7.dfsg.orig/tftpd_list.c +++ atftp-0.7.dfsg/tftpd_list.c @@ -173,8 +173,7 @@ while (1) { - if ((tmp->client.sin_port == client->client.sin_port) && - (tmp->client.sin_addr.s_addr == client->client.sin_addr.s_addr) && + if (sockaddr_equal(&tmp->client, &client->client) && (tmp->done == 0)) { /* unlock mutex and exit */ @@ -249,7 +248,7 @@ */ int tftpd_clientlist_done(struct thread_data *thread, struct client_info *client, - struct sockaddr_in *sock) + struct sockaddr_storage *sock) { struct client_info *head = thread->client_info; @@ -266,7 +265,7 @@ /* walk the list to find this client */ while (head) { - if (memcmp(sock, &head->client, sizeof(struct sockaddr_in)) == 0) + if (sockaddr_equal(sock, &head->client)) { head->done = 1; pthread_mutex_unlock(&thread->client_mutex); --- atftp-0.7.dfsg.orig/config.sub +++ atftp-0.7.dfsg/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2004-01-05' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -145,7 +148,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -170,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -230,14 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,24 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -297,20 +318,20 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +340,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -326,27 +348,35 @@ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -363,6 +393,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -414,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -442,12 +483,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -470,6 +526,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -620,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -635,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -648,10 +720,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -664,6 +732,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -732,10 +803,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -743,9 +810,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -767,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -776,6 +850,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -832,6 +912,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -858,6 +942,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -869,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -958,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1018,6 +1113,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1048,6 +1147,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1064,13 +1166,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1143,19 +1242,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1173,7 +1276,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1282,6 +1385,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1304,6 +1410,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1313,9 +1425,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1341,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1359,9 +1474,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1527,7 +1648,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- atftp-0.7.dfsg.orig/argz.h +++ atftp-0.7.dfsg/argz.h @@ -180,7 +180,7 @@ #ifdef __USE_EXTERN_INLINES extern inline char * __argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry) __THROW + __const char *__entry) { if (__entry) { @@ -194,7 +194,7 @@ } extern inline char * argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry) __THROW + __const char *__entry) { return __argz_next (__argz, __argz_len, __entry); } --- atftp-0.7.dfsg.orig/tftpd.c +++ atftp-0.7.dfsg/tftpd.c @@ -57,9 +57,12 @@ int tftpd_max_thread = 100; /* number of concurent thread allowed */ int tftpd_timeout = 300; /* number of second of inactivity before exiting */ -char directory[MAXLEN] = "/tftpboot/"; +char directory[MAXLEN] = "/srv/tftp/"; int retry_timeout = S_TIMEOUT; +int on = 1; +int listen_local = 0; + int tftpd_daemon = 0; /* By default we are started by inetd */ int tftpd_daemon_no_fork = 0; /* For who want a false daemon mode */ short tftpd_port = 0; /* Port atftpd listen to */ @@ -153,10 +156,10 @@ int run = 1; /* while (run) loop */ struct thread_data *new; /* for allocation of new thread_data */ int sockfd; /* used in daemon mode */ - struct sockaddr_in sa; /* used in daemon mode */ - struct servent *serv; + struct sockaddr_storage sa; /* used in daemon mode */ struct passwd *user; struct group *group; + pthread_t tid; #ifdef HAVE_MTFTP pthread_t mtftp_thread; @@ -228,32 +231,48 @@ exit(2); } - /* find the port */ - if (tftpd_port == 0) + /* find the port; initialise sockaddr_storage structure */ + if (strlen(tftpd_addr) > 0 || tftpd_port == 0) { - if ((serv = getservbyname("tftp", "udp")) == NULL) + struct addrinfo hints, *result; + int err; + + /* look up the service and host */ + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_NUMERICHOST; + err = getaddrinfo(tftpd_addr, tftpd_port ? NULL : "tftp", + &hints, &result); + if (err == EAI_SERVICE) { logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); exit(1); } - tftpd_port = ntohs(serv->s_port); - } - /* initialise sockaddr_in structure */ - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons(tftpd_port); - if (strlen(tftpd_addr) > 0) - { - if (inet_aton(tftpd_addr, &(sa.sin_addr)) == 0) + if (err || sockaddr_set_addrinfo(&sa, result)) { logger(LOG_ERR, "atftpd: invalid IP address %s", tftpd_addr); exit(1); } + + if (!tftpd_port) + tftpd_port = sockaddr_get_port(&sa); + else { + sa.ss_family = AF_INET; + sockaddr_set_port(&sa, tftpd_port); + } + + freeaddrinfo(result); } - else - sa.sin_addr.s_addr = htonl(INADDR_ANY); + + if (strlen(tftpd_addr) == 0) + { + memset(&sa, 0, sizeof(sa)); + sa.ss_family = AF_INET; + sockaddr_set_port(&sa, tftpd_port); + } + /* open the socket */ - if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == 0) + if ((sockfd = socket(sa.ss_family, SOCK_DGRAM, 0)) == 0) { logger(LOG_ERR, "atftpd: can't open socket"); exit(1); @@ -300,11 +319,13 @@ open_logger("atftpd", log_file, logging_level); } +#if defined(SOL_IP) && defined(IP_PKTINFO) /* We need to retieve some information from incomming packets */ if (setsockopt(0, SOL_IP, IP_PKTINFO, &one, sizeof(one)) != 0) { logger(LOG_WARNING, "Failed to set socket option: %s", strerror(errno)); } +#endif /* save main thread ID for proper signal handling */ main_thread_id = pthread_self(); @@ -387,10 +408,18 @@ packets */ if (!tftpd_cancel) { + int rv; + if ((tftpd_timeout == 0) || (tftpd_daemon)) - select(FD_SETSIZE, &rfds, NULL, NULL, NULL); + rv = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); else - select(FD_SETSIZE, &rfds, NULL, NULL, &tv); + rv = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); + if (rv < 0) { + logger(LOG_ERR, "%s: %d: select: %s", + __FILE__, __LINE__, strerror(errno)); + /* Clear the bits, they are undefined! */ + FD_ZERO(&rfds); + } } #ifdef RATE_CONTROL @@ -466,7 +495,7 @@ new->client_info->next = NULL; /* Start a new server thread. */ - if (pthread_create(&new->tid, NULL, tftpd_receive_request, + if (pthread_create(&tid, NULL, tftpd_receive_request, (void *)new) != 0) { logger(LOG_ERR, "Failed to start new thread"); @@ -558,16 +587,15 @@ int num_of_threads; int abort = 0; /* 1 if we need to abort because the maximum number of threads have been reached*/ - struct sockaddr_in to; /* destination of client's packet */ - socklen_t len = sizeof(struct sockaddr); + struct sockaddr_storage to; /* destination of client's packet */ + socklen_t len = sizeof(to); -#ifdef HAVE_WRAP - char client_addr[16]; -#endif + char addr_str[SOCKADDR_PRINT_ADDR_LEN]; /* Detach ourself. That way the main thread does not have to * wait for us with pthread_join. */ - pthread_detach(pthread_self()); + data->tid = pthread_self(); + pthread_detach(data->tid); /* Read the first packet from stdin. */ data_size = data->data_buffer_size; @@ -591,12 +619,12 @@ { /* Verify the client has access. We don't look for the name but rely only on the IP address for that. */ - inet_ntop(AF_INET, &data->client_info->client.sin_addr, - client_addr, sizeof(client_addr)); - if (hosts_ctl("in.tftpd", STRING_UNKNOWN, client_addr, + sockaddr_print_addr(&data->client_info->client, + addr_str, sizeof(addr_str)); + if (hosts_ctl("in.tftpd", STRING_UNKNOWN, addr_str, STRING_UNKNOWN) == 0) { - logger(LOG_ERR, "Connection refused from %s", client_addr); + logger(LOG_ERR, "Connection refused from %s", addr_str); abort = 1; } } @@ -612,9 +640,27 @@ else { /* open a socket for client communication */ - data->sockfd = socket(PF_INET, SOCK_DGRAM, 0); - to.sin_family = AF_INET; - to.sin_port = 0; + data->sockfd = socket(data->client_info->client.ss_family, + SOCK_DGRAM, 0); + memset(&to, 0, sizeof(to)); + to.ss_family = data->client_info->client.ss_family; + /* Force socket to listen on local address. Do not listen on broadcast address 255.255.255.255. + If the socket listens on the broadcast address, Linux tells the remote client the port + is unreachable. This happens even if SO_BROADCAST is set in setsockopt for this socket. + I was unable to find a kernel option or /proc/sys flag to make the kernel pay attention to + these requests, so the workaround is to force listening on the local address. */ + if (listen_local == 1) + { + logger(LOG_INFO, "forcing socket to listen on local address"); + if (setsockopt(data->sockfd, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) != 0) { + logger(LOG_ERR, "setsockopt: %s", strerror(errno)); + } + } + else + { + logger(LOG_INFO, "socket may listen on any address, including broadcast"); + } + if (data->sockfd > 0) { /* bind the socket to the interface */ @@ -624,13 +670,16 @@ retval = ABORT; } /* read back assigned port */ - len = sizeof(struct sockaddr); + len = sizeof(to); if (getsockname(data->sockfd, (struct sockaddr *)&to, &len) == -1) { logger(LOG_ERR, "getsockname: %s", strerror(errno)); retval = ABORT; } /* connect the socket, faster for kernel operation */ + /* this is not a good idea on FreeBSD, because sendto() cannot + be used on a connected datagram socket */ +#if !defined(__FreeBSD_kernel__) if (connect(data->sockfd, (struct sockaddr *)&data->client_info->client, sizeof(data->client_info->client)) == -1) @@ -638,8 +687,10 @@ logger(LOG_ERR, "connect: %s", strerror(errno)); retval = ABORT; } +#endif logger(LOG_DEBUG, "Creating new socket: %s:%d", - inet_ntoa(to.sin_addr), ntohs(to.sin_port)); + sockaddr_print_addr(&to, addr_str, sizeof(addr_str)), + sockaddr_get_port(&to)); /* read options from request */ opt_parse_request(data->data_buffer, data_size, @@ -657,8 +708,9 @@ case GET_RRQ: logger(LOG_NOTICE, "Serving %s to %s:%d", data->tftp_options[OPT_FILENAME].value, - inet_ntoa(data->client_info->client.sin_addr), - ntohs(data->client_info->client.sin_port)); + sockaddr_print_addr(&data->client_info->client, + addr_str, sizeof(addr_str)), + sockaddr_get_port(&data->client_info->client)); if (data->trace) logger(LOG_DEBUG, "received RRQ <%s>", string); if (tftpd_send_file(data) == OK) @@ -668,7 +720,8 @@ break; case GET_WRQ: logger(LOG_NOTICE, "Fetching from %s to %s", - inet_ntoa(data->client_info->client.sin_addr), + sockaddr_print_addr(&data->client_info->client, + addr_str, sizeof(addr_str)), data->tftp_options[OPT_FILENAME].value); if (data->trace) logger(LOG_DEBUG, "received WRQ <%s>", string); @@ -693,7 +746,9 @@ break; default: logger(LOG_NOTICE, "Invalid request <%d> from %s", - retval, inet_ntoa(data->client_info->client.sin_addr)); + retval, + sockaddr_print_addr(&data->client_info->client, + addr_str, sizeof(addr_str))); tftp_send_error(data->sockfd, &data->client_info->client, EBADOP, data->data_buffer, data->data_buffer_size); if (data->trace) @@ -732,8 +787,8 @@ tftpd_clientlist_free(data); /* free the thread structure */ - free(data); - + free(data); + logger(LOG_INFO, "Server thread exiting"); pthread_exit(NULL); } @@ -811,6 +866,7 @@ { "no-multicast", 0, NULL, 'M' }, { "logfile", 1, NULL, 'L' }, { "pidfile", 1, NULL, 'I'}, + { "listen-local", 0, NULL, 'F'}, { "daemon", 0, NULL, 'D' }, { "no-fork", 0, NULL, 'N'}, { "user", 1, NULL, 'U'}, @@ -888,6 +944,9 @@ case 'I': pidfile = strdup(optarg); break; + case 'F': + listen_local = 1; + break; case 'D': tftpd_daemon = 1; break; @@ -1015,6 +1074,10 @@ logger(LOG_INFO, " log file: %s", (log_file==NULL) ? "syslog":log_file); if (pidfile) logger(LOG_INFO, " pid file: %s", pidfile); + if (listen_local == 1) + logger(LOG_INFO, " forcing to listen on local interfaces: on."); + else + logger(LOG_INFO, " not forcing to listen on local interfaces."); if (tftpd_daemon == 1) logger(LOG_INFO, " server timeout: Not used"); else @@ -1111,11 +1174,12 @@ " output messages\n" " --trace : log all sent and received packets\n" " --no-timeout : disable 'timeout' from RFC2349\n" - " --no-tisize : disable 'tsize' from RFC2349\n" + " --no-tsize : disable 'tsize' from RFC2349\n" " --no-blksize : disable 'blksize' from RFC2348\n" " --no-multicast : disable 'multicast' from RFC2090\n" " --logfile : logfile to log logs to ;-)\n" " --pidfile : write PID to this file\n" + " --listen-local : force listen on local network address\n" " --daemon : run atftpd standalone (no inetd)\n" " --no-fork : run as a daemon, don't fork\n" " --user : default is nobody\n" --- atftp-0.7.dfsg.orig/stats.c +++ atftp-0.7.dfsg/stats.c @@ -157,8 +157,8 @@ logger(LOG_INFO, " Load measurements:"); logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", - (double)(s_stats.tms.tms_utime) / CLK_TCK, - (double)(s_stats.tms.tms_stime) / CLK_TCK); + (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC, + (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC); logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / --- atftp-0.7.dfsg.orig/tftp_io.c +++ atftp-0.7.dfsg/tftp_io.c @@ -42,7 +42,7 @@ * < OptN | 0 | ValueN | 0 | * >-------------------------------- */ -int tftp_send_request(int socket, struct sockaddr_in *sa, short type, +int tftp_send_request(int socket, struct sockaddr_storage *sa, short type, char *data_buffer, int data_buffer_size, struct tftp_opt *tftp_options) { @@ -94,7 +94,7 @@ *| Opcode | Block # | * ------------------- */ -int tftp_send_ack(int socket, struct sockaddr_in *sa, short block_number) +int tftp_send_ack(int socket, struct sockaddr_storage *sa, short block_number) { struct tftphdr tftphdr; int result; @@ -115,7 +115,7 @@ *| Opcode | Opt1 | 0 | Value1 | 0 | OptN | 0 | ValueN | 0 | * --------------------------------------------------------------------------- */ -int tftp_send_oack(int socket, struct sockaddr_in *sa, struct tftp_opt *tftp_options, +int tftp_send_oack(int socket, struct sockaddr_storage *sa, struct tftp_opt *tftp_options, char *buffer, int buffer_size) { @@ -154,7 +154,7 @@ *| Opcode | ErrorCode | ErrMsg | 0 | * --------------------------------------- */ -int tftp_send_error(int socket, struct sockaddr_in *sa, short err_code, +int tftp_send_error(int socket, struct sockaddr_storage *sa, short err_code, char *buffer, int buffer_size) { int size; @@ -182,7 +182,7 @@ *| Opcode | Block # | Data | * ---------------------------- */ -int tftp_send_data(int socket, struct sockaddr_in *sa, short block_number, +int tftp_send_data(int socket, struct sockaddr_storage *sa, short block_number, int size, char *data) { struct tftphdr *tftphdr = (struct tftphdr *)data; @@ -202,19 +202,20 @@ * Wait for a packet. This function can listen on 2 sockets. This is * needed by the multicast tftp client. */ -int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_in *sa, - struct sockaddr_in *sa_from, struct sockaddr_in *sa_to, +int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, + struct sockaddr_storage *sa_from, struct sockaddr_storage *sa_to, int timeout, int *size, char *data) { int result; struct timeval tv; fd_set rfds; - struct sockaddr_in from; + struct sockaddr_storage from; struct tftphdr *tftphdr = (struct tftphdr *)data; struct msghdr msg; /* used to get client's packet info */ struct cmsghdr *cmsg; - struct in_pktinfo *pktinfo; + struct in_pktinfo *pktinfo4; + struct in6_pktinfo *pktinfo6; struct iovec iov; char cbuf[1024]; @@ -284,12 +285,26 @@ cmsg != NULL && cmsg->cmsg_len >= sizeof(*cmsg); cmsg = CMSG_NXTHDR(&msg, cmsg)) { +#if defined(SOL_IP) && defined(IP_PKTINFO) if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO) { - pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg); - sa_to->sin_addr = pktinfo->ipi_addr; + pktinfo4 = (struct in_pktinfo *)CMSG_DATA(cmsg); + sa_to->ss_family = AF_INET; + ((struct sockaddr_in *)sa_to)->sin_addr = + pktinfo4->ipi_addr; } +#endif +#if defined(SOL_IPV6) && defined(IPV6_PKTINFO) + if (cmsg->cmsg_level == SOL_IPV6 + && cmsg->cmsg_type == IPV6_PKTINFO) + { + pktinfo6 = (struct in6_pktinfo *)CMSG_DATA(cmsg); + sa_to->ss_family = AF_INET6; + ((struct sockaddr_in6 *)sa_to)->sin6_addr = + pktinfo6->ipi6_addr; + } +#endif break; } } @@ -301,8 +316,8 @@ if (sa_from != NULL) memcpy(sa_from, &from, sizeof(from)); - /* if sa as never been initialised, sa->sin_port is still 0 */ - if (sa->sin_port == htons(0)) + /* if sa as never been initialised, port is still 0 */ + if (sockaddr_get_port(&sa) == 0) memcpy(sa, &from, sizeof(from)); --- atftp-0.7.dfsg.orig/tftp_def.c +++ atftp-0.7.dfsg/tftp_def.c @@ -16,10 +16,12 @@ #include "config.h" +#include #include #include #include #include +#include #include "tftp_def.h" #include "options.h" #include "logger.h" @@ -140,8 +142,10 @@ */ inline char *Strncpy(char *to, const char *from, size_t size) { - to[size-1] = '\000'; - return strncpy(to, from, size - 1); + strncpy(to, from, size); + if (size>0) + to[size-1] = '\000'; + return to; } @@ -182,3 +186,135 @@ return OK; } + +char * +sockaddr_print_addr(const struct sockaddr_storage *ss, char *buf, size_t len) +{ + const void *addr; + if (ss->ss_family == AF_INET) + addr = &((const struct sockaddr_in *)ss)->sin_addr; + else if (ss->ss_family == AF_INET6) + addr = &((const struct sockaddr_in6 *)ss)->sin6_addr; + else + assert(!"sockaddr_print: unsupported address family"); + return (char *)inet_ntop(ss->ss_family, addr, buf, len); +} + +uint16_t sockaddr_get_port(const struct sockaddr_storage *ss) +{ + if (ss->ss_family == AF_INET) + return ntohs(((const struct sockaddr_in *)ss)->sin_port); + if (ss->ss_family == AF_INET6) + return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); + return 0; +} + +void sockaddr_set_port(struct sockaddr_storage *ss, uint16_t port) +{ + if (ss->ss_family == AF_INET) + ((struct sockaddr_in *)ss)->sin_port = htons(port); + else if (ss->ss_family == AF_INET6) + ((struct sockaddr_in6 *)ss)->sin6_port = htons(port); + else + assert(!"sockaddr_set_port: unsupported address family"); +} + +int sockaddr_equal(const struct sockaddr_storage *left, + const struct sockaddr_storage *right) +{ + if (left->ss_family != right->ss_family) + return 0; + if (left->ss_family == AF_INET) + { + const struct sockaddr_in + *sa_left = (const struct sockaddr_in *)left, + *sa_right = (const struct sockaddr_in *)right; + return (sa_left->sin_port == sa_right->sin_port && + sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr); + } + if (left->ss_family == AF_INET6) + { + const struct sockaddr_in6 + *sa_left = (const struct sockaddr_in6 *)left, + *sa_right = (const struct sockaddr_in6 *)right; + return (sa_left->sin6_port == sa_right->sin6_port && + memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, + sizeof(sa_left->sin6_addr)) == 0 && + sa_left->sin6_scope_id == sa_right->sin6_scope_id); + } + assert(!"sockaddr_equal: unsupported address family"); +} + +int sockaddr_equal_addr(const struct sockaddr_storage *left, + const struct sockaddr_storage *right) +{ + if (left->ss_family != right->ss_family) + return 0; + if (left->ss_family == AF_INET) + { + const struct sockaddr_in + *sa_left = (const struct sockaddr_in *)left, + *sa_right = (const struct sockaddr_in *)right; + return sa_left->sin_addr.s_addr == sa_right->sin_addr.s_addr; + } + if (left->ss_family == AF_INET6) + { + const struct sockaddr_in6 + *sa_left = (const struct sockaddr_in6 *)left, + *sa_right = (const struct sockaddr_in6 *)right; + return (memcmp(&sa_left->sin6_addr, &sa_right->sin6_addr, + sizeof(sa_left->sin6_addr)) == 0 && + sa_left->sin6_scope_id == sa_right->sin6_scope_id); + } + assert(!"sockaddr_equal_addr: unsupported address family"); +} + +int sockaddr_is_multicast(const struct sockaddr_storage *ss) +{ + if (ss->ss_family == AF_INET) + return IN_MULTICAST(ntohl(((const struct sockaddr_in *)ss) + ->sin_addr.s_addr)); + if (ss->ss_family == AF_INET6) + return IN6_IS_ADDR_MULTICAST(&((const struct sockaddr_in6 *)ss) + ->sin6_addr); + return 0; +} + +void sockaddr_get_mreq(const struct sockaddr_storage *ss, + union ip_mreq_storage *mreq) +{ + if (ss->ss_family == AF_INET) + { + const struct sockaddr_in *sa = (const struct sockaddr_in *)ss; + mreq->v4.imr_multiaddr = sa->sin_addr; + mreq->v4.imr_interface.s_addr = htonl(INADDR_ANY); + } + else if (ss->ss_family == AF_INET6) + { + const struct sockaddr_in6 *sa = (const struct sockaddr_in6 *)ss; + mreq->v6.ipv6mr_multiaddr = sa->sin6_addr; + mreq->v6.ipv6mr_interface = 0; /* ??? */ + } + else + { + assert(!"sockaddr_get_mreq: unsupported address family"); + } +} + +int +sockaddr_set_addrinfo(struct sockaddr_storage *ss, const struct addrinfo *ai) +{ + while (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) + { + ai = ai->ai_next; + if (!ai) + { + errno = EAFNOSUPPORT; + return -1; + } + } + + assert(sizeof(*ss) >= ai->ai_addrlen); + memcpy(ss, ai->ai_addr, ai->ai_addrlen); + return 0; +} --- atftp-0.7.dfsg.orig/debian/atftpd.README.Debian +++ atftp-0.7.dfsg/debian/atftpd.README.Debian @@ -1,12 +1,18 @@ atftpd for Debian ----------------- -atftpd uses /tftpboot by default as base directory. You can change -that by editing /etc/inetd.conf. Remember that you must give the -directory appropriate permissions in order to be able to read/write -files according to your needs. +atftpd uses /srv/tftp by default as base directory. You can change +that by editing /etc/inetd.conf or with 'dpkg-reconfigure atftpd'. -The /tftpboot directory is not created by the package. You need to +Please note that inetd.conf will not be modified by a dpkg-reconfigure, if +there's already an entry. +Also, /etc/default/atftpd will be created if it does not exist. So if +you want 'dpkg-reconfigure atftpd' to create /etc/default/atftpd or +/etc/inetd.conf you should remove the file or delete the tftp line. + +Remember that you must give the directory appropriate permissions in order +to be able to read/write files according to your needs (owner=nobody). + +The /srv/tftp directory is not created by the package. You need to create it and give appropriate permissions by hand. - -- Remi Lefebvre , Sun, 20 Aug 2000 14:32:15 -0400 --- atftp-0.7.dfsg.orig/debian/copyright +++ atftp-0.7.dfsg/debian/copyright @@ -8,6 +8,11 @@ Copyright: +Copyright (c) 2000 Jean-Pierre Lefebvre + and Remi Lefebvre + +License: + atftp is free software; you can redistribute them and/or modify them under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later --- atftp-0.7.dfsg.orig/debian/atftpd.prerm +++ atftp-0.7.dfsg/debian/atftpd.prerm @@ -1,5 +1,16 @@ -#!/bin/sh -e +#!/bin/sh -update-inetd --group BOOT --disable tftp +set -e + +# Stops daemon if it is running under our control +if [ -x /etc/init.d/atftpd ]; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d --quiet atftpd stop + else + /etc/init.d/atftpd stop + fi +fi #DEBHELPER# + +exit 0 --- atftp-0.7.dfsg.orig/debian/atftpd.conffiles +++ atftp-0.7.dfsg/debian/atftpd.conffiles @@ -1 +0,0 @@ -/etc/init.d/atftpd --- atftp-0.7.dfsg.orig/debian/atftpd.postrm +++ atftp-0.7.dfsg/debian/atftpd.postrm @@ -1,8 +1,33 @@ #!/bin/sh -e + if [ "$1" = "purge" ]; then - update-inetd --group BOOT --remove "tftp.*/usr/sbin/in.tftpd.*" + # If netbase is not installed, then we don't need to do the remove. + if command -v update-inetd >/dev/null 2>&1; + then + update-inetd --group BOOT --remove "tftp.*/usr/sbin/in.tftpd.*" + fi + + BASEDIR="/var/lib/tftpd" + if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_get atftpd/basedir + if [ "$RET" ]; then + BASEDIR="$RET" + fi + fi + + if [ -d $BASEDIR ]; then + rmdir --ignore-fail-on-non-empty $BASEDIR + fi + + # logrotate rm -f /etc/logorotate.d/atftpd + + # init.d config file + if [ -r /etc/default/atftpd ]; then + rm -f /etc/default/atftpd + fi fi #DEBHELPER# --- atftp-0.7.dfsg.orig/debian/atftpd.templates +++ atftp-0.7.dfsg/debian/atftpd.templates @@ -1,11 +1,3 @@ -Template: atftpd/configure -Type: boolean -Default: true -_Description: Do you want to configure the server? - atftpd can have various parameters passed to it. These parameters can - optimize performances for servers that do heavy work. The default values - are suitable for most purposes. - Template: atftpd/use_inetd Type: boolean Default: true @@ -16,66 +8,71 @@ Template: atftpd/tftpd-timeout Type: string -_Default: 300 -_Description: Server timeout. +Default: 300 +_Description: Server timeout: How many seconds the main thread waits before exiting. Template: atftpd/retry-timeout Type: string -_Default: 5 -_Description: Retry timeout. +Default: 5 +_Description: Retry timeout: How many seconds to wait for a reply before retransmitting a packet. Template: atftpd/maxthread Type: string -_Default: 100 -_Description: Maximum number of threads. +Default: 100 +_Description: Maximum number of threads: Maximum number of concurrent threads that can be running. Template: atftpd/verbosity Type: select -_Choices: 7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING) +Choices: 7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING), 1 (LOG_ALERT) Default: 5 (LOG_NOTICE) -_Description: Verbosity level. +_Description: Verbosity level: Level of logging. 7 logs everything including debug logs. 1 will log only the system critical logs. 5 (LOG_NOTICE) is the default value. Template: atftpd/timeout Type: boolean Default: true -_Description: Enable 'timeout' support +_Description: Enable 'timeout' support? Template: atftpd/tsize Type: boolean Default: true -_Description: Enable 'tsize' support +_Description: Enable 'tsize' support? Template: atftpd/blksize Type: boolean Default: true -_Description: Enable 'block size' support +_Description: Enable 'block size' support? Template: atftpd/multicast Type: boolean Default: true -_Description: Enable 'multicast' support +_Description: Enable multicast support? + +Template: atftpd/ttl +Type: string +Default: 1 +_Description: TTL for multicast packets: Template: atftpd/port Type: string -_Default: 69 -_Description: Port to listen for tftp request +Default: 69 +_Description: Port to listen for tftp request: Template: atftpd/mcast_port Type: string -_Default: 1758 -_Description: Port range for multicast file transfer +Default: 1758 +_Description: Port range for multicast file transfer: Multicast transfer will use any available port in a given set. For example, "2000-2003, 3000" allow atftpd to use port 2000 to 2003 and 3000. Template: atftpd/mcast_addr Type: string -_Default: 239.255.0.0-255 -_Description: Address range for multicast transfer +Default: 239.239.239.0-255 +_Description: Address range for multicast transfer: Multicast transfer will use any available addresses from a given set of addresses. Syntax is "a.b.c.d-d,a.b.c.d,..." @@ -83,19 +80,19 @@ Type: boolean Default: false _Description: Log to file instead of syslog? - If your server does intensive tftp file serving, it is a good idea to say - yes. That will avoid to clutter your syslog with tftpd logs. + If your server does intensive tftp file serving, it is a good idea to + accept here. That will avoid cluttering your syslog with tftpd logs. Template: atftpd/logfile Type: string -_Default: /var/log/atftpd.log -_Description: Log file. - A file where atftpd write its logs. This file will be made writable for +Default: /var/log/atftpd.log +_Description: Log file: + A file where atftpd will write its logs. This file will be made writable for the user 'nobody' and group 'nogroup'. Template: atftpd/basedir Type: string -_Default: /tftpboot -_Description: Base directory. +Default: /srv/tftp +_Description: Base directory: The directory tree from where atftpd can serve files. That directory must be world readable. --- atftp-0.7.dfsg.orig/debian/atftpd.postinst +++ atftp-0.7.dfsg/debian/atftpd.postinst @@ -3,14 +3,15 @@ # TODO: # - error checking on values provided by debconf frontend -BASEDIR=/tftpboot +BASEDIR=/srv/tftp DAEMON="--daemon" . /usr/share/debconf/confmodule db_version 2.0 -db_get atftpd/configure -if [ "$RET" = "true" ]; then +# Do not ask if we want to configure it +#db_get atftpd/configure +#if [ "$RET" = "true" ]; then db_get atftpd/use_inetd if [ "$RET" ]; then @@ -70,6 +71,10 @@ if [ "$RET" ]; then MCASTADDR="--mcast-addr $RET" fi + db_get atftpd/ttl + if [ "$RET" ]; then + MCASTTTL="--mcast-ttl $RET" + fi fi db_get atftpd/verbosity @@ -86,17 +91,19 @@ # if the file doesn't exist, create it if [ ! -f $RET ]; then touch $RET - chown nobody.nogroup $RET + chown nobody:nogroup $RET chmod 640 $RET fi # modify the logrotate file - echo -e "$RET {\n" \ - " daily\n" \ - " rotate 5\n" \ - " compress\n" \ - " copytruncate\n" \ - " missingok\n" \ - "}" > /etc/logrotate.d/atftpd + cat >/etc/logrotate.d/atftpd < /etc/default/atftpd - echo "OPTIONS=\"$DAEMON $TFTPD_PORT $RETRY_TIMEOUT $NOTIMEOUT $NOTSIZE $NOBLKSIZE $NOMCAST \ -$MCASTPORT $MCASTADDR $MAXTHREAD $VERBOSITY $LOGFILE $BASEDIR\"" >> /etc/default/atftpd + if [ ! -f /etc/default/atftpd ]; then + echo "USE_INETD=false" > /etc/default/atftpd + echo "OPTIONS=\"$DAEMON $TFTPD_PORT $RETRY_TIMEOUT $NOTIMEOUT $NOTSIZE $NOBLKSIZE $NOMCAST \ +$MCASTPORT $MCASTADDR $MCASTTTL $MAXTHREAD $VERBOSITY $LOGFILE $BASEDIR\""|tr -s " " >> /etc/default/atftpd + fi + update-inetd --disable tftp else - update-inetd --group BOOT --add "tftp dgram udp wait \ - nobody /usr/sbin/tcpd /usr/sbin/in.tftpd $TFTPD_TIMEOUT $RETRY_TIMEOUT $NOTIMEOUT $NOTSIZE $NOBLKSIZE \ -$NOMCAST $MCASTPORT $MCASTADDR $MAXTHREAD $VERBOSITY $LOGFILE $BASEDIR" - echo "USE_INETD=true" > /etc/default/atftpd - echo "OPTIONS=\"$DAEMON $TFTPD_PORT $TFTPD_TIMEOUT $RETRY_TIMEOUT $NOTIMEOUT $NOTSIZE $NOBLKSIZE $NOMCAST \ -$MCASTPORT $MCASTADDR $MAXTHREAD $VERBOSITY $LOGFILE $BASEDIR\"" >> /etc/default/atftpd + INETOPTS=`echo "$TFTPD_TIMEOUT $RETRY_TIMEOUT $NOTIMEOUT $NOTSIZE $NOBLKSIZE $NOMCAST $MCASTPORT $MCASTADDR $MCASTTTL $MAXTHREAD $VERBOSITY $LOGFILE $BASEDIR"|tr -s " "` + update-inetd --group BOOT --add "tftp dgram udp4 wait nobody /usr/sbin/tcpd /usr/sbin/in.tftpd $INETOPTS" + if [ ! -f /etc/default/atftpd ]; then + echo "USE_INETD=true" > /etc/default/atftpd + echo "OPTIONS=\"$INETOPTS\""|tr -s " " >> /etc/default/atftpd + fi fi #DEBHELPER# --- atftp-0.7.dfsg.orig/debian/atftpd.config +++ atftp-0.7.dfsg/debian/atftpd.config @@ -3,27 +3,15 @@ . /usr/share/debconf/confmodule db_version 2.0 -# BUG: If you upgrade atftp and you previously configured it with debconf, -# that is, the atftpd/configure value in the database is set to true, -# then the config script will overwrite the config in inetd.conf with -# all values from the database. This could be avoided (or so I thought) -# by setting the atftpd/configure value to false in the event db_input -# had returned false but this causes the config value to be ignored if -# the package is being preconfigured. In such a case, the config script -# is called twice, the first time it shows the question and returns -# true but the second it doesn't show the question and would return -# false, which results in the atftpd/configure value being set to false -# and makes the config value being ignore despite the fact the user -# answered them (#93398). I didn't find any better way to work around -# this. Sorry. - -db_beginblock -db_input high atftpd/configure || true -db_endblock -db_go +# Do not ask if you need to configure atftp (Bug#266329) -db_get atftpd/configure -if [ "$RET" = "true" ]; then +#db_beginblock +#db_input high atftpd/configure || true +#db_endblock +#db_go + +#db_get atftpd/configure +#if [ "$RET" = "true" ]; then db_beginblock db_input medium atftpd/use_inetd || true @@ -34,43 +22,44 @@ if [ "$RET" = "true" ]; then db_beginblock - db_input medium atftpd/tftpd-timeout || true + db_input low atftpd/tftpd-timeout || true db_endblock db_go fi db_beginblock - db_input medium atftpd/port || true - db_input medium atftpd/retry-timeout || true - db_input medium atftpd/maxthread || true - db_input medium atftpd/timeout || true - db_input medium atftpd/tsize || true - db_input medium atftpd/blksize || true - db_input medium atftpd/multicast || true + db_input low atftpd/port || true + db_input low atftpd/retry-timeout || true + db_input low atftpd/maxthread || true + db_input low atftpd/timeout || true + db_input low atftpd/tsize || true + db_input low atftpd/blksize || true + db_input low atftpd/multicast || true db_endblock db_go db_get atftpd/multicast if [ "$RET" = "true" ]; then db_beginblock - db_input medium atftpd/mcast_port || true + db_input low atftpd/mcast_port || true db_input medium atftpd/mcast_addr || true + db_input medium atftpd/ttl || true db_endblock db_go fi db_beginblock - db_input medium atftpd/verbosity || true + db_input low atftpd/verbosity || true db_input medium atftpd/basedir || true - db_input medium atftpd/logtofile || true + db_input low atftpd/logtofile || true db_endblock db_go db_get atftpd/logtofile if [ "$RET" = "true" ]; then db_beginblock - db_input medium atftpd/logfile || true + db_input low atftpd/logfile || true db_endblock db_go fi -fi +#fi --- atftp-0.7.dfsg.orig/debian/watch.old +++ atftp-0.7.dfsg/debian/watch.old @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.mamalinux.com/pub/atftp/ atftp-([0-9\.]*)\.tar\.gz debian uupdate --- atftp-0.7.dfsg.orig/debian/changelog +++ atftp-0.7.dfsg/debian/changelog @@ -1,8 +1,248 @@ +atftp (0.7.dfsg-9.3) unstable; urgency=low + + * Non-maintainer upload. + * Apply patch listen on requested port when in daemon mode. + Thanks to Len Sorensen. (Closes: #609813) + + -- tony mancill Wed, 12 Jan 2011 20:58:05 -0800 + +atftp (0.7.dfsg-9.2) unstable; urgency=low + + * Non-maintainer upload. + * Fixed use of sendto() over a connected datagram socket on FreeBSD + (closes: #598474). + + -- Giovanni Mascellani Mon, 04 Oct 2010 16:46:32 +0200 + +atftp (0.7.dfsg-9.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply IPv6 support patch by Ben Hutchings. Closes: #580473 + * Add AC_GNU_SOURCE to configure.ac to address FTBFS. + - Patches applied directly to sources to minimize changes for NMU, + as the current Debian packaging does not include a patch system. + + -- tony mancill Wed, 15 Sep 2010 21:24:52 -0700 + +atftp (0.7.dfsg-9) unstable; urgency=medium + + * urgency=medium RC bug. + * use rmdir instead of rm in postrm. Closes: #573992, #574211 + * added $remote_fs in Required-Start + + -- Ludovic Drolez Mon, 29 Mar 2010 18:55:55 +0200 + +atftp (0.7.dfsg-8) unstable; urgency=low + + * depends on libreadline-dev. Closes: #553729 + * Purge empty dir. Closes: #531282 + * /srv/tftp is now the default tftp root data directory. Closes: #537642 + * Updated cs.po. Closes: #534959 + * Updated config.sub .guess. Closes: #536295 + * Fixed a typo in the help screen. Closes: #537405 + * Make sure we have the --daemon option before starting atftpd. + Closes: #535604 + + -- Ludovic Drolez Tue, 21 Aug 2009 17:03:24 +0200 + +atftp (0.7.dfsg-7) unstable; urgency=low + + * Crash fix. Closes: #514521 + * Updated sv.po. Closes: #503348 + * Added support for logging to stdout. Closes: #484739 + * Added the --listen-local patch. Closes: #366632 + * Recommends inet-superserver. Closes: #516407 + + -- Ludovic Drolez Wed, 01 Apr 2009 17:03:07 +0200 + +atftp (0.7.dfsg-6) unstable; urgency=medium + + * Urgency = medium because of a grave bug + * Now generate a cleaner /etc/default/atftpd file. Closes: #489757 + * Do not overwrite /etc/default/atftpd and inetd.conf. Closes: #490152 + * The basedir is now created with proper permissions. Upload + feature tested. Closes: #489757 + * Updated sv.po. Closes: #491757 + + -- Ludovic Drolez Tue, 22 Jul 2008 19:07:56 +0200 + +atftp (0.7.dfsg-5) unstable; urgency=medium + + * inetd.conf: change udp to udp4. Closes: #484932 + * fixed pcre substitutions. Closes: #473777 + + -- Ludovic Drolez Fri, 13 Jun 2008 16:00:57 +0200 + +atftp (0.7.dfsg-4) unstable; urgency=medium + + * Urgency=medium because of RC bug fixed + * Choosed /var/lib/tftpboot as default tftp directory, and removed + the provides field. Closes: #455263, #411322 + * Moved the watch file. Closes: #449674 + * Fixed incorrect options handling thanks to Hollis Blanchard. + Closes: #332621 + * Updated pt.po. Closes: #443653 + + -- Ludovic Drolez Tue, 18 Dec 2007 18:49:33 +0100 + +atftp (0.7.dfsg-3) unstable; urgency=high + + * Removed the inetd dependency. + * Added Leo Weppelman select patch. Closes: #411456 + * Fixed the FTBFS. Closes: #436310 + + -- Ludovic Drolez Mon, 6 Aug 2007 20:52:06 +0200 + +atftp (0.7.dfsg-2) unstable; urgency=medium + + * Use CLOCKS_PER_SEC instead of CLK_TCK. Fixed a FTBFS. Closes: #420900 + * Re-added a kFreeBSD patch lost by a NMU !!! Closes: #404063, #402700 + * New debconf translations. Closes: #410212, #414112, #422416 + + -- Ludovic Drolez Fri, 18 May 2007 17:59:01 +0200 + +atftp (0.7.dfsg-1.2) unstable; urgency=low + + * Non-maintainer upload to fix a pending l10n issues that affects the + experimental Debian i18n server. + * Debconf translations: + - Japanese fixed. Closes: #410525 + + -- Christian Perrier Sun, 11 Feb 2007 15:08:39 +0100 + +atftp (0.7.dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload to fix longstanding l10n issues + * Debconf templates translations: + - German updated. Closes: #399964 + - Japanense updated. Closes: #402616 + - Dutch updated. Closes: #392215 + - French updated. Closes: #393740 + - Russian updated. Closes: #404426 + - Spanish updated. Closes: #402098 + + -- Christian Perrier Sat, 20 Jan 2007 12:48:31 +0100 + +atftp (0.7.dfsg-1) unstable; urgency=medium + + * Integrated the NMUs. Closes: #382683, #365188, #389830 + * If netbase is not installed, then we don't need to use update-inetd. + Closes: #388295 + * Bump Standards-Version to 3.7.2. + * Add debconf-updatepo to the rules. + * Russian translation of debconf messages thanks to Yuri Kozlov. + Closes: #368498 + + -- Ludovic Drolez Mon, 2 Oct 2006 00:31:23 +0200 + +atftp (0.7.dfsg-0.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: Remove netkit-inetd recommends, and make the netbase + dependency versioned. netbase provides the appropriate inetd + dependency. Closes: #382683. + + -- Roger Leigh Sun, 20 Aug 2006 17:11:26 +0100 + +atftp (0.7.dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Repackage upstream without RFC (Closes: #365188) + + -- Julien Danjou Thu, 1 Jun 2006 15:53:11 +0200 + +atftp (0.7-11) unstable; urgency=low + + * added a patch for freebsd. Closes: #342391 + * added debconf Portuguese translation. Closes: #342284 + + -- Ludovic Drolez Tue, 13 Dec 2005 16:29:05 +0100 + +atftp (0.7-10) unstable; urgency=low + + * DH_COMPAT=4 and added ${misc:Depends}. Closes: #331747 + * Debconf Swedish translation update. Closes: #330263 + + -- Ludovic Drolez Fri, 7 Oct 2005 15:00:35 +0200 + +atftp (0.7-9) unstable; urgency=medium + + * Random segfaults fixed. Closes: #271816 + * Now only recommend netkid-inetd. Closes: #313208 + * Updated the Vietnamese debconf translation. Closes: #313122 + + -- Ludovic Drolez Tue, 21 Jun 2005 21:51:23 +0200 + +atftp (0.7-8) unstable; urgency=low + + * Typos removed from atftpd.templates. Closes: #309468 + * Added the Vietnamese translation for debconf. Closes: #309461 + * Thanks to Clytie Siddall for submitting the two bugs above. + + -- Ludovic Drolez Tue, 7 Jun 2005 21:31:25 +0200 + +atftp (0.7-7) unstable; urgency=low + + * Fixed a FTBFS on amd64. Closes: #297549 + * Added Japanese and Brazilian debconf translations. Closes: #304280,#297038 + + -- Ludovic Drolez Tue, 12 Apr 2005 12:55:47 +0200 + +atftp (0.7-6) unstable; urgency=low + + * Segfault fixed on AMD64. Closes: Bug#291829 + * debian 'watch' file added. + + -- Ludovic Drolez Wed, 26 Jan 2005 19:12:44 +0100 + +atftp (0.7-5) unstable; urgency=high + + * Ugency=high because of a RC bug fixed. + * Removed a bashism in the postinst. Closes: #289633 + * Czech po-debconf translation added by Miroslav Kure. Closes: #288014 + * Danish po-debconf translation added by Morten Brix Pedersen. + Closes: #288133 + * Copyright fixed. Closes: #290062 + + -- Ludovic Drolez Tue, 11 Jan 2005 12:19:27 +0100 + +atftp (0.7-4) unstable; urgency=low + + * updated all po-debconf translations. Closes: #281561 + * polish debconf translation added. Thanks to Bartosz Fenski. + * added debconf support for setting the multicast TTL value + * default mcast subnet changed to 239.239.239.0/24 since some routers + do not seem to like 239.255.0.0/24 + + -- Ludovic Drolez Mon, 28 Dec 2004 19:11:57 +0100 + +atftp (0.7-3) unstable; urgency=low + + * /etc/default/atftpd removed on purge. Closes: #279707 + * purging stops atftpd. Closes: #275258 + * punctuation modified. Closes: #275692 + * updated the German debconf translation. Closes: #275691 + + -- Ludovic Drolez Fri, 5 Nov 2004 14:32:57 +0100 + +atftp (0.7-2) unstable; urgency=medium + + * Patched tftp.c, to have an exit status !=0 when an error occurs + * Data corruption bug in multicast mode fixed. Closes: #275052 + Urgency set to medium because of this bug. + * Typos in description corrected. Closes: #272565 + * Dutch debconf translation added. Closes: #245913 + * Debconf: removed the initial question and changed priority + levels. Closes: #266329 + + -- Ludovic Drolez Sun, 26 Sep 2004 14:25:40 +0200 + atftp (0.7-1) unstable; urgency=low - * New release + * New maintainer. Closes: Bug#227258. + * New release. Closes: Bug#263221, Bug#155300, Bug#180461, Bug#238196. - -- J-P Fri, 21 Feb 2003 00:17:31 -0500 + -- Ludovic Drolez Tue, 14 Sep 2004 18:50:20 +0200 atftp (0.6.2) unstable; urgency=low @@ -49,7 +289,7 @@ * Be less picky about removing existing tftp entries in inetd.conf (Closes: #107053). * General spelling fixes in the english templates (Closes: #109475). - * Swedish templates (Thanks to Martin Sjögren) (Closes: #109523). + * Swedish templates (Thanks to Martin Sjogren) (Closes: #109523). * Portuguese templates (Thanks to Andre Luis Lopes) (Closes: #107042). -- Remi Lefebvre Sat, 18 Aug 2001 23:13:25 -0400 @@ -60,7 +300,7 @@ * Improved readline support. * Added status info in the client. * Added daemon mode. - * Added spanish templates (Thanks to Carlos Valdivia Yagüe) (Closes: #103043). + * Added spanish templates (Thanks to Carlos Valdivia Yague) (Closes: #103043). * Added "Provides: tftpd" (Closes: #100676). * Added french templates. * Added german templates (Thanks to Sebastian Feltel) (Closes: #100066). --- atftp-0.7.dfsg.orig/debian/rules +++ atftp-0.7.dfsg/debian/rules @@ -7,15 +7,13 @@ # package. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatability version to use. -export DH_COMPAT=2 +export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS configure: configure-stamp + configure-stamp: dh_testdir # Add here commands to configure the package. @@ -29,17 +27,21 @@ # Add here commands to compile the package. $(MAKE) - + # For the woody backport + #$(MAKE) LDFLAGS="--static" LIBREADLINE="-lreadline -lncurses -lpthread" LIBWRAP="-lwrap -lnsl" touch build-stamp -clean: +clean: clean-patched + +clean-patched: dh_testdir dh_testroot + debconf-updatepo rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - -$(MAKE) clean - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean @@ -56,7 +58,7 @@ dh_movefiles dh_installdocs -patftp - dh_installdocs -patftpd docs/*.html + dh_installdocs -patftpd # Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. @@ -88,4 +90,14 @@ dh_builddeb binary: binary-indep binary-arch + +#patch: patch-stamp +#patch-stamp: +# dpatch apply-all +# dpatch call-all -a=pkg-info >patch-stamp +# +#unpatch: +# dpatch deapply-all +# rm -rf patch-stamp debian/patched + .PHONY: build clean binary-indep binary-arch binary install --- atftp-0.7.dfsg.orig/debian/control +++ atftp-0.7.dfsg/debian/control @@ -1,29 +1,29 @@ Source: atftp Section: net -Priority: optional -Maintainer: Debian QA Group -Build-Depends: libreadline4-dev, debhelper (>= 4.1.16), po-debconf, libwrap-dev, libpcre3-dev -Standards-Version: 3.6.1 +Priority: extra +Maintainer: Ludovic Drolez +Build-Depends: libreadline-dev, debhelper (>= 5), po-debconf, libwrap0-dev, libpcre3-dev +Standards-Version: 3.8.4 Package: atftp Architecture: any -Depends: ${shlibs:Depends} -Description: Advanced TFTP client. +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: advanced TFTP client Interactive client for the Trivial File Transfer Protocol (TFTP). Its usage is mainly for testing and debugging the Atftp server. TFTP client - is usually implemented in BIOS and bootstrap programs like pxelinux when - booting from LAN. Atftp also support non-interactive invocation for + is usually implemented in BIOS and bootstraps programs like pxelinux when + booting from LAN. Atftp also supports non-interactive invocation for easy use in scripts. Package: atftpd Architecture: any -Depends: ${shlibs:Depends}, netkit-inetd, debconf +Depends: ${shlibs:Depends}, ${misc:Depends}, update-inetd +Recommends: inet-superserver Conflicts: tftpd Suggests: logrotate -Provides: tftpd -Description: Advanced TFTP server. +Description: advanced TFTP server Multi-threaded TFTP server implementing all options (option extension and multicast) as specified in RFC1350, RFC2090, RFC2347, RFC2348 and RFC2349. - Atftpd also support multicast protocol known as mtftp, defined in the PXE + Atftpd also supports multicast protocol known as mtftp, defined in the PXE specification. The server supports being started from inetd(8) as well as in daemon mode using init scripts. --- atftp-0.7.dfsg.orig/debian/atftpd.init.d +++ atftp-0.7.dfsg/debian/atftpd.init.d @@ -1,12 +1,24 @@ #! /bin/sh # -# atftpd - Script to launch atftpd server. Based on Skeleton. +# atftpd - Script to launch atftpd server. # +### BEGIN INIT INFO +# Provides: atftpd +# Required-Start: $syslog $network $remote_fs +# Required-Stop: $syslog $network $remote_fs +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Launch atftpd server +# Description: Launch atftpd server, a TFTP server useful +# for network boot (PXE). +### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/atftpd NAME=atftpd -DESC="Advanced Trivial FTP server" +DESC="Advanced TFTP server" USE_INETD=true OPTIONS="" @@ -22,6 +34,9 @@ exit 0; fi +# Make sure we have --daemon when not using inetd +echo "$OPTIONS"|grep -q -- --daemon || OPTIONS="--daemon $OPTIONS" + case "$1" in start) echo -n "Starting $DESC: " --- atftp-0.7.dfsg.orig/debian/compat +++ atftp-0.7.dfsg/debian/compat @@ -0,0 +1 @@ +5 --- atftp-0.7.dfsg.orig/debian/po/templates.pot +++ atftp-0.7.dfsg/debian/po/templates.pot @@ -1,22 +1,14 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-17 18:54-0500\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,28 +18,13 @@ #. Type: boolean #. Description -#: ../atftpd.templates:4 -msgid "Do you want to configure the server?" -msgstr "" - -#. Type: boolean -#. Description -#: ../atftpd.templates:4 -msgid "" -"atftpd can have various parameters passed to it. These parameters can " -"optimize performances for servers that do heavy work. The default values are " -"suitable for most purposes." -msgstr "" - -#. Type: boolean -#. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "Should the server be started by inetd?" msgstr "" #. Type: boolean #. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "" "atftpd can be started by the inetd superserver or as a daemon and handle " "incoming connections by itself. The latter is only recommend for very high " @@ -55,74 +32,50 @@ msgstr "" #. Type: string -#. Default -#: ../atftpd.templates:19 -msgid "300" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:20 -msgid "Server timeout." +#: ../atftpd.templates:2001 +msgid "Server timeout:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:20 +#: ../atftpd.templates:2001 msgid "How many seconds the main thread waits before exiting." msgstr "" #. Type: string -#. Default -#: ../atftpd.templates:25 -msgid "5" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:26 -msgid "Retry timeout." +#: ../atftpd.templates:3001 +msgid "Retry timeout:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:26 +#: ../atftpd.templates:3001 msgid "How many seconds to wait for a reply before retransmitting a packet." msgstr "" #. Type: string -#. Default -#: ../atftpd.templates:31 -msgid "100" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:32 -msgid "Maximum number of threads." +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:32 +#: ../atftpd.templates:4001 msgid "Maximum number of concurrent threads that can be running." msgstr "" #. Type: select -#. Choices -#: ../atftpd.templates:37 -msgid "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" -msgstr "" - -#. Type: select #. Description -#: ../atftpd.templates:39 -msgid "Verbosity level." +#: ../atftpd.templates:5001 +msgid "Verbosity level:" msgstr "" #. Type: select #. Description -#: ../atftpd.templates:39 +#: ../atftpd.templates:5001 msgid "" "Level of logging. 7 logs everything including debug logs. 1 will log only " "the system critical logs. 5 (LOG_NOTICE) is the default value." @@ -130,75 +83,63 @@ #. Type: boolean #. Description -#: ../atftpd.templates:46 -msgid "Enable 'timeout' support" +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" msgstr "" #. Type: boolean #. Description -#: ../atftpd.templates:51 -msgid "Enable 'tsize' support" +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" msgstr "" #. Type: boolean #. Description -#: ../atftpd.templates:56 -msgid "Enable 'block size' support" +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" msgstr "" #. Type: boolean #. Description -#: ../atftpd.templates:61 -msgid "Enable 'multicast' support" -msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:65 -msgid "69" +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:66 -msgid "Port to listen for tftp request" +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" msgstr "" #. Type: string -#. Default -#: ../atftpd.templates:70 -msgid "1758" +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:71 -msgid "Port range for multicast file transfer" +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:71 +#: ../atftpd.templates:12001 msgid "" "Multicast transfer will use any available port in a given set. For example, " "\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." msgstr "" #. Type: string -#. Default -#: ../atftpd.templates:77 -msgid "239.255.0.0-255" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:78 -msgid "Address range for multicast transfer" +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:78 +#: ../atftpd.templates:13001 msgid "" "Multicast transfer will use any available addresses from a given set of " "addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" @@ -206,53 +147,41 @@ #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "Log to file instead of syslog?" msgstr "" #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "" -"If your server does intensive tftp file serving, it is a good idea to say " -"yes. That will avoid to clutter your syslog with tftpd logs." -msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:91 -msgid "/var/log/atftpd.log" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." msgstr "" #. Type: string #. Description -#: ../atftpd.templates:92 -msgid "Log file." +#: ../atftpd.templates:15001 +msgid "Log file:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:92 +#: ../atftpd.templates:15001 msgid "" -"A file where atftpd write its logs. This file will be made writable for the " -"user 'nobody' and group 'nogroup'." -msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:98 -msgid "/tftpboot" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." msgstr "" #. Type: string #. Description -#: ../atftpd.templates:99 -msgid "Base directory." +#: ../atftpd.templates:16001 +msgid "Base directory:" msgstr "" #. Type: string #. Description -#: ../atftpd.templates:99 +#: ../atftpd.templates:16001 msgid "" "The directory tree from where atftpd can serve files. That directory must be " "world readable." --- atftp-0.7.dfsg.orig/debian/po/cs.po +++ atftp-0.7.dfsg/debian/po/cs.po @@ -0,0 +1,213 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2009-06-27 12:30+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Má se server spouÅ¡tÄ›t pÅ™es inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd může běžet jako samostatný daemon a sám zpracovávat příchozí " +"požadavky, nebo může být spouÅ¡tÄ›n z metaserveru inetd. První možnost je " +"doporuÄená pouze pro velmi vytížené servery." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "ÄŒasový limit serveru:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Kolik sekund má hlavní vlákno Äekat, než se ukonÄí." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "ÄŒasový limit opakování:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "Kolik sekund má server Äekat na odpovÄ›Ä, než paket odeÅ¡le znovu." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maximální poÄet vláken:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Maximální poÄet souÄasnÄ› běžících vláken." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Míra upovídanosti:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"7 zaznamená vÅ¡e vÄetnÄ› ladicích hlášení. 1 zaznamená pouze kritické záznamy, " +"5 (LOG_NOTICE) je výchozí hodnota." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Povolit podporu „timeout“?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Povolit podporu „tsize“?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Povolit podporu „block size“?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Povolit podporu multicastu?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL pro multicastové pakety:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port, na kterém se má naslouchat tftp požadavkům:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Rozsah portů pro hromadný (multicast) pÅ™enos souborů:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Pro hromadný pÅ™enos použijí libovolné porty ze zadané množiny. Například " +"„2000-2003, 3000“ dovolí atftpd použít porty 2000 až 2003 a port 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Rozsah adres pro hromadné pÅ™enosy:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Pro hromadný pÅ™enos použijí libovolné adresy ze zadané množiny adres. " +"Syntaxe je následující: „a.b.c.d-d,a.b.c.d,...“" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Nepoužívat pro záznamy syslog, ale samostatný soubor?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Pokud bude váš server nabízet tftp soubory mnoha klientům, je dobré tuto " +"možnost povolit, protože se pak záznamy tftpd nebudou míchat se záznamy " +"syslogu." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Soubor pro záznamy:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Soubor, do kterého bude atftpd zapisovat své záznamy. Práva souboru budou " +"nastavena tak, aby do nÄ›j mohl zapisovat uživatel „nobody“ a skupina " +"„nogroup“." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Základní adresář:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"Adresářový strom, ze kterého atftpd nabízí soubory. Adresář musí být Äitelný " +"pro vÅ¡echny." --- atftp-0.7.dfsg.orig/debian/po/fr.po +++ atftp-0.7.dfsg/debian/po/fr.po @@ -11,188 +11,140 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-17 18:54-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: atftp 0.7\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2004-12-28 16:35+0100\n" +"Last-Translator: Cyril Brulebois \n" +"Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description -#: ../atftpd.templates:4 -msgid "Do you want to configure the server?" -msgstr "Désirez-vous configurer le serveur ?" - -#. Type: boolean -#. Description -#: ../atftpd.templates:4 -msgid "" -"atftpd can have various parameters passed to it. These parameters can " -"optimize performances for servers that do heavy work. The default values are " -"suitable for most purposes." -msgstr "" -"Atftpd peut recevoir des paramètres variés. Il est possible d'optimiser les " -"performances en modifiant ces paramètres pour des serveurs effectuant des " -"tâches lourdes. Dans la plupart des cas, les valeurs par défaut sont " -"largement suffisantes." - -#. Type: boolean -#. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "Should the server be started by inetd?" -msgstr "Doit-on démarrer le serveur par inetd ?" +msgstr "Faut-il démarrer le serveur via inetd ?" #. Type: boolean #. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "" "atftpd can be started by the inetd superserver or as a daemon and handle " "incoming connections by itself. The latter is only recommend for very high " "usage server." msgstr "" "Atftpd peut être démarré par le super-serveur inetd ou en serveur " -"indépendant qui gère lui-même les connexions entrantes. Ce dernier mode " -"n'est recommandé que pour les serveurs fortement sollicités." - -#. Type: string -#. Default -#: ../atftpd.templates:19 -msgid "300" -msgstr "300" +"indépendant pour qu'il gère lui-même les connexions entrantes. Ce dernier " +"mode n'est recommandé que pour les serveurs fortement sollicités." #. Type: string #. Description -#: ../atftpd.templates:20 -msgid "Server timeout." -msgstr "Délais du serveur." +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Délai d'attente (« timeout ») du serveur :" #. Type: string #. Description -#: ../atftpd.templates:20 +#: ../atftpd.templates:2001 msgid "How many seconds the main thread waits before exiting." msgstr "" -"Combien de secondes la connexion principale est-elle maintenue avant de " -"s'interrompre ?" - -#. Type: string -#. Default -#: ../atftpd.templates:25 -msgid "5" -msgstr "5" +"Veuillez indiquer le nombre de secondes pendant lesquelles la connexion " +"principale doit être maintenue avant d'être interrompue." #. Type: string #. Description -#: ../atftpd.templates:26 -msgid "Retry timeout." -msgstr "Délais de relance." +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Délai de relance (« retry timeout ») :" #. Type: string #. Description -#: ../atftpd.templates:26 +#: ../atftpd.templates:3001 msgid "How many seconds to wait for a reply before retransmitting a packet." msgstr "" -"Combien de secondes faut-il attendre une réponse avant de retransmettre un " -"paquet ?" - -#. Type: string -#. Default -#: ../atftpd.templates:31 -msgid "100" -msgstr "100" +"Veuillez indiquer le délai d'attente d'une réponse, en secondes, avant la " +"retransmission d'un paquet." #. Type: string #. Description -#: ../atftpd.templates:32 -msgid "Maximum number of threads." -msgstr "Nombre maximal de connexions." +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Nombre maximal de connexions :" #. Type: string #. Description -#: ../atftpd.templates:32 +#: ../atftpd.templates:4001 msgid "Maximum number of concurrent threads that can be running." -msgstr "Nombre maximal de connexions simultanées." - -#. Type: select -#. Choices -#: ../atftpd.templates:37 -msgid "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" -msgstr "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" +msgstr "Veuillez indiquer le nombre maximal de connexions simultanées." #. Type: select #. Description -#: ../atftpd.templates:39 -msgid "Verbosity level." -msgstr "Niveau des informations souhaitées" +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Niveau de détail souhaité :" #. Type: select #. Description -#: ../atftpd.templates:39 +#: ../atftpd.templates:5001 msgid "" "Level of logging. 7 logs everything including debug logs. 1 will log only " "the system critical logs. 5 (LOG_NOTICE) is the default value." msgstr "" -"Niveau en dessous duquel l'information est enregistrée dans les journaux. 7 " -"enregistre l'information de déboguage. 1 n'enregistre que les informations " -"critiques. La valeur par défaut est 5 (LOG_NOTICE)." +"Veuillez choisir le niveau de détail pour les informations enregistrées dans " +"les journaux. « 7 » enregistre des informations de débogage. « 1 » " +"n'enregistre que les informations critiques. La valeur par défaut est " +"« 5 » (LOG_NOTICE)." #. Type: boolean #. Description -#: ../atftpd.templates:46 -msgid "Enable 'timeout' support" -msgstr "Activer le support « timeout »" +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Faut-il activer la gestion de l'option TFTP « timeout » ?" #. Type: boolean #. Description -#: ../atftpd.templates:51 -msgid "Enable 'tsize' support" -msgstr "Activer le support « tsize »" +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Faut-il activer la gestion de l'option TFTP « tsize » ?" #. Type: boolean #. Description -#: ../atftpd.templates:56 -msgid "Enable 'block size' support" -msgstr "Activer le support « block size »" +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Faut-il activer la gestion de l'option TFTP « block size » ?" #. Type: boolean #. Description -#: ../atftpd.templates:61 -msgid "Enable 'multicast' support" -msgstr "Activer le support « multicast »" - -#. Type: string -#. Default -#: ../atftpd.templates:65 -msgid "69" -msgstr "69" +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Faut-il activer la gestion de la multidiffusion (« multicast ») ?" #. Type: string #. Description -#: ../atftpd.templates:66 -msgid "Port to listen for tftp request" -msgstr "Port d'écoute pour les requêtes tftp" +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL pour les paquets multicast :" #. Type: string -#. Default -#: ../atftpd.templates:70 -msgid "1758" -msgstr "1758" +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port d'écoute pour les requêtes tftp :" #. Type: string #. Description -#: ../atftpd.templates:71 -msgid "Port range for multicast file transfer" -msgstr "Intervalle des ports pour le transfert de fichiers en multidiffusion" +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Intervalle de ports pour le transfert de fichiers en multidiffusion :" #. Type: string #. Description -#: ../atftpd.templates:71 +#: ../atftpd.templates:12001 msgid "" "Multicast transfer will use any available port in a given set. For example, " "\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." @@ -202,84 +154,68 @@ "à atftpd d'utiliser les ports 2000 à 2003 et 3000." #. Type: string -#. Default -#: ../atftpd.templates:77 -msgid "239.255.0.0-255" -msgstr "239.255.0.0-255" - -#. Type: string #. Description -#: ../atftpd.templates:78 -msgid "Address range for multicast transfer" -msgstr "Intervalle d'adresses pour le transfert en multidiffusion" +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Intervalle d'adresses pour le transfert en multidiffusion :" #. Type: string #. Description -#: ../atftpd.templates:78 +#: ../atftpd.templates:13001 msgid "" "Multicast transfer will use any available addresses from a given set of " "addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" msgstr "" "Le transfert en multidiffusion va utiliser n'importe quelle adresse " -"disponible d'un ensemble donné. La syntaxe est « a.b.c.d-d,a.b.c.d,... »" +"disponible d'un ensemble donné. La syntaxe est « a.b.c.d-d,a.b.c.d,... »." #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "Log to file instead of syslog?" -msgstr "Enregistrer les messages dans un fichier à la place de syslog ?" +msgstr "" +"Faut-il enregistrer les messages dans un fichier à la place de syslog ?" #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "" -"If your server does intensive tftp file serving, it is a good idea to say " -"yes. That will avoid to clutter your syslog with tftpd logs." +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." msgstr "" "Si votre serveur est utilisé intensivement comme serveur tftp, il est " -"conseillé de dire « Yes ». Ceci évitera d'encombrer le journal syslog avec " -"les journaux tftpd." - -#. Type: string -#. Default -#: ../atftpd.templates:91 -msgid "/var/log/atftpd.log" -msgstr "/var/log/atftpd.log" +"conseillé de choisir cette option. Ceci évitera d'encombrer le journal " +"syslog avec les journaux tftpd." #. Type: string #. Description -#: ../atftpd.templates:92 -msgid "Log file." -msgstr "Fichier des journaux" +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Fichier journal :" #. Type: string #. Description -#: ../atftpd.templates:92 +#: ../atftpd.templates:15001 msgid "" -"A file where atftpd write its logs. This file will be made writable for the " -"user 'nobody' and group 'nogroup'." +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." msgstr "" -"Fichier dans lequel les informations seront enregistrées. Ce fichier sera " -"modifiable par l'utilisateur « nobody » et le groupe « nogroup »." - -#. Type: string -#. Default -#: ../atftpd.templates:98 -msgid "/tftpboot" -msgstr "/tftpboot" +"Veuillez indiquer le fichier dans lequel les informations seront " +"enregistrées. Ce fichier sera modifiable par l'utilisateur « nobody » et le " +"groupe « nogroup »." #. Type: string #. Description -#: ../atftpd.templates:99 -msgid "Base directory." -msgstr "Répertoire racine." +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Répertoire racine :" #. Type: string #. Description -#: ../atftpd.templates:99 +#: ../atftpd.templates:16001 msgid "" "The directory tree from where atftpd can serve files. That directory must be " "world readable." msgstr "" -"Le répertoire à partir duquel atftpd sert les fichiers. Ce répertoire doit " -"pouvoir être lu par tous." +"Veuillez indiquer le répertoire à partir duquel atftpd sert les fichiers. Ce " +"répertoire doit pouvoir être lu par tous." --- atftp-0.7.dfsg.orig/debian/po/nl.po +++ atftp-0.7.dfsg/debian/po/nl.po @@ -0,0 +1,219 @@ +# translation of atftp_0.7.dfsg-1_templates.po to Dutch +# This file is distributed under the same license as the atftp package. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Luk Claes , 2004 +# Kurt De Bree , 2006. +# This is an unofficial translation +# +msgid "" +msgstr "" +"Project-Id-Version: atftp_0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2006-10-05 19:50+0100\n" +"Last-Translator: Kurt De Bree \n" +"Language-Team: Debian l10n Dutch \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Moet de server door inetd worden gestart?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd kan worden gestart door de inetd-superserver of als een " +"achtergronddienst en zelf binnenkomende verbindingen afhandelen. Dit laatste " +"wordt enkel aanbevolen voor een zeer veel gebruikte server." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Server wachttijd:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Hoeveel seconden de hoofddraad moet wachten alvorens af te sluiten." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Wachttijd tussen pogingen:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Hoeveel seconden atftpd moet wachten op een antwoord alvorens een pakket " +"opnieuw te verzenden." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maximum aantal draden:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Maximum aantal draden die tegelijk kunnen uitvoeren." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Woordenrijkheidsniveau (verbosity):" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Bewaarniveau. 7 bewaart alles, ook debug-berichten. 1 zal enkel de " +"systeemkritieke berichten bewaren. 5 (LOG_NOTICE) is de standaardwaarde." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "'timeout'-ondersteuning activeren?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "'tsize'-ondersteuning activeren?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "'blokgrootte'-ondersteuning activeren?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "'Multicast'-ondersteuning activeren?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL (Time To Level) voor multicast-pakketten:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Poort waarnaar moet geluisterd worden voor tftp-aanvragen:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Poortbereik voor multicast-bestandsuitwisseling:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Multicast-overdracht zal elke beschikbare poort in een gegeven verzameling " +"gebruiken. Bijvoorbeeld, \"2000-2003, 3000\" staat atftpd toe om poorten " +"2000 tot 2003 en 3000 te gebruiken." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Adresbereik voor multicast-uitwisseling:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Multicast-overdracht zal elk beschikbaar adres van een gegeven verzameling " +"adressen gebruiken. De syntax is \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "In bestand bewaren in plaats van in syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Als uw server intensieve tftp-bestandsbediening doet, is het een goed idee " +"om hier te aanvaarden. Dit zal voorkomen dat uw syslog een warboel wordt van " +"tftpd-berichten." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Logbestand:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Een bestand waar atftpd de logboeken in schrijft. Dit bestand zal " +"schrijfbaar gemaakt worden voor gebruiker 'nobody' en groep 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Basismap:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"De mapstructuur waar atftpd bestanden kan bedienen. Deze map moet leesbaar " +"zijn voor de wereld." --- atftp-0.7.dfsg.orig/debian/po/gl.po +++ atftp-0.7.dfsg/debian/po/gl.po @@ -0,0 +1,205 @@ +# Galician translation of atftp's debconf templates +# This file is distributed under the same license as the atftp package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2007-03-09 09:21+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "¿Debería iniciarse o servidor mediante inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"Pódese iniciar atftpd no superservidor inetd ou pódese iniciar coma un " +"servizo para que xestione as conexións entrantes el só. Só se recomenda isto " +"se se emprega moito o servidor." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Tempo de espera do servidor:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Cantos segundos agarda o fío principal antes de saír." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Tempo de espera para volver tentar:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Cantos segundos hai que agardar por unha resposta antes de retransmitir un " +"paquete." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Número máximo de fíos:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Número máximo de fíos simultaneos que pode haber en execución." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Nivel de información:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Nivel do rexistro. 7 rexistra todo, incluídos os rexistros de depuración. 1 " +"ha rexistrar só os sucesos críticos. 5 (LOG_NOTICE) é o valor por defecto." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "¿Activar o soporte de \"timeout\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "¿Activar o soporte de \"tsize\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "¿Activar o soporte de \"block size\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "¿Activar o soporte de multicast?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL dos paquetes multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Porto no que esperar peticións tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Rango de portos para a transferencia de ficheiros multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"As transferencias multicast han empregar calquera porto dispoñible dun " +"conxunto determinado. Por exemplo, \"2000-2003, 3000\" permite a atftpd " +"empregar os portos 2000 a 2003 e o porto 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Rango de enderezos para as transferencias multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"As transferencias multicast han empregar calquera enderezo dun conxunto dado " +"de enderezos. A sintaxe é \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "¿Rexistrar nun ficheiro no canto de en syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Se o seu servidor serve moitos ficheiros, é unha boa idea aceptar esta " +"opción. Isto ha impedir que se encha o syslog con rexistros de tftpd." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Ficheiro de rexistro:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"O ficheiro no que atftpd ha gravar os rexistros. Este ficheiro ha ter " +"permisos de escritura para o usuario \"nobody\" e o grupo \"nogroup\"." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Directorio base:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"A árbore de directorios desde a que atftpd pode servir ficheiros. Ese " +"directorio ten que ter permisos de lectura para todo o mundo." --- atftp-0.7.dfsg.orig/debian/po/sv.po +++ atftp-0.7.dfsg/debian/po/sv.po @@ -1,142 +1,92 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy # -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' # -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-17 18:54-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: atftp 0.7-9\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2008-10-25 01:31+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description -#: ../atftpd.templates:4 -#, fuzzy -msgid "Do you want to configure the server?" -msgstr "Vill du konfigurera servern?" - -#. Type: boolean -#. Description -#: ../atftpd.templates:4 -#, fuzzy -msgid "" -"atftpd can have various parameters passed to it. These parameters can " -"optimize performances for servers that do heavy work. The default values are " -"suitable for most purposes." -msgstr "" -"atfptd kan använda ett antal parametrar. Dessa parametrar kan optimera " -"prestandan för servrar som är hårt belastade. De förvalda värdena är " -"användbara för de flesta syften." - -#. Type: boolean -#. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "Should the server be started by inetd?" -msgstr "" +msgstr "Ska servern startas via inetd?" #. Type: boolean #. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "" "atftpd can be started by the inetd superserver or as a daemon and handle " "incoming connections by itself. The latter is only recommend for very high " "usage server." msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:19 -msgid "300" -msgstr "" +"atftpd kan startas av inetd superserver eller som en daemon och hantera " +"inkommande anslutningar på egen hand. Den senare rekommenderas för de system " +"som kräver hög prestanda." #. Type: string #. Description -#: ../atftpd.templates:20 -#, fuzzy -msgid "Server timeout." -msgstr "Tid till avslut." +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Tid till avslut:" #. Type: string #. Description -#: ../atftpd.templates:20 -#, fuzzy +#: ../atftpd.templates:2001 msgid "How many seconds the main thread waits before exiting." msgstr "Hur många sekunder huvudtråden väntar innan den avslutas." #. Type: string -#. Default -#: ../atftpd.templates:25 -msgid "5" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:26 -#, fuzzy -msgid "Retry timeout." -msgstr "Tid mellan försök." +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Tid mellan försök:" #. Type: string #. Description -#: ../atftpd.templates:26 -#, fuzzy +#: ../atftpd.templates:3001 msgid "How many seconds to wait for a reply before retransmitting a packet." msgstr "" "Hur många sekunder vi väntar på ett svar innan vi skickar paketet igen." #. Type: string -#. Default -#: ../atftpd.templates:31 -msgid "100" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:32 -#, fuzzy -msgid "Maximum number of threads." -msgstr "Maximalt antal trådar." +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maximalt antal trådar:" #. Type: string #. Description -#: ../atftpd.templates:32 -#, fuzzy +#: ../atftpd.templates:4001 msgid "Maximum number of concurrent threads that can be running." msgstr "Maximalt antal trådar som kan köras parallellt." #. Type: select -#. Choices -#: ../atftpd.templates:37 -msgid "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" -msgstr "" - -#. Type: select #. Description -#: ../atftpd.templates:39 -#, fuzzy -msgid "Verbosity level." -msgstr "Förklaringsnivå." +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Förklaringsnivå:" #. Type: select #. Description -#: ../atftpd.templates:39 -#, fuzzy +#: ../atftpd.templates:5001 msgid "" "Level of logging. 7 logs everything including debug logs. 1 will log only " "the system critical logs. 5 (LOG_NOTICE) is the default value." @@ -146,142 +96,117 @@ #. Type: boolean #. Description -#: ../atftpd.templates:46 -msgid "Enable 'timeout' support" -msgstr "" +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Aktivera 'timeout' stöd?" #. Type: boolean #. Description -#: ../atftpd.templates:51 -msgid "Enable 'tsize' support" -msgstr "" +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Aktivera 'tsize' stöd?" #. Type: boolean #. Description -#: ../atftpd.templates:56 -msgid "Enable 'block size' support" -msgstr "" +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Aktivera 'block size' stöd?" #. Type: boolean #. Description -#: ../atftpd.templates:61 -msgid "Enable 'multicast' support" -msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:65 -msgid "69" -msgstr "" +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Aktivera multicast stöd?" #. Type: string #. Description -#: ../atftpd.templates:66 -msgid "Port to listen for tftp request" -msgstr "" +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL för multicast-paket" #. Type: string -#. Default -#: ../atftpd.templates:70 -msgid "1758" -msgstr "" +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port för att lyssna på tftp anslutningar:" #. Type: string #. Description -#: ../atftpd.templates:71 -msgid "Port range for multicast file transfer" -msgstr "" +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Portrymd för multicast-överföringar:" #. Type: string #. Description -#: ../atftpd.templates:71 +#: ../atftpd.templates:12001 msgid "" "Multicast transfer will use any available port in a given set. For example, " "\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:77 -msgid "239.255.0.0-255" -msgstr "" +"Multicast-överföring kommer att använda de tillgängliga portar som angivets. " +"Till exempel, \"2000-2003, 3000\" kommer atftpd att använda portarna 2000 " +"till 2003 och 3000." #. Type: string #. Description -#: ../atftpd.templates:78 -msgid "Address range for multicast transfer" -msgstr "" +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Adressrymd för multicast-överföring:" #. Type: string #. Description -#: ../atftpd.templates:78 +#: ../atftpd.templates:13001 msgid "" "Multicast transfer will use any available addresses from a given set of " "addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" msgstr "" +"Multicast-överföring kommer att använda adresser ur adressrymden som " +"specificeras enligt följande, \"a.b.c.d-d,a.b.c.d,...\"" #. Type: boolean #. Description -#: ../atftpd.templates:85 -#, fuzzy +#: ../atftpd.templates:14001 msgid "Log to file instead of syslog?" msgstr "Logga till fil istället för syslog?" #. Type: boolean #. Description -#: ../atftpd.templates:85 -#, fuzzy +#: ../atftpd.templates:14001 msgid "" -"If your server does intensive tftp file serving, it is a good idea to say " -"yes. That will avoid to clutter your syslog with tftpd logs." -msgstr "" -"Om servern är mycket intensivt trafikerad är det en god idé att säga ja. Det " -"undviker att skräpa ner systemloggen med atftpd-loggar." - -#. Type: string -#. Default -#: ../atftpd.templates:91 -msgid "/var/log/atftpd.log" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." msgstr "" +"Om din server utför många tftpöverföringar rekomenderas att du väljer detta " +"alternativ för att undvika att fylla syslog med tftpd-information." #. Type: string #. Description -#: ../atftpd.templates:92 -#, fuzzy -msgid "Log file." -msgstr "Loggfil." +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Loggfil:" #. Type: string #. Description -#: ../atftpd.templates:92 -#, fuzzy +#: ../atftpd.templates:15001 msgid "" -"A file where atftpd write its logs. This file will be made writable for the " -"user 'nobody' and group 'nogroup'." +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." msgstr "" -"Filen som atftpd skriver sin logg till. Denna fil kommer göras skrivbar för " +"Filen som atftpd skriver sin logg till. Filen kommer att vara skribar av " "användaren 'nobody' och gruppen 'nogroup'." #. Type: string -#. Default -#: ../atftpd.templates:98 -msgid "/tftpboot" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:99 -#, fuzzy -msgid "Base directory." -msgstr "Rotkatalog." +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Hemkatalog:" #. Type: string #. Description -#: ../atftpd.templates:99 -#, fuzzy +#: ../atftpd.templates:16001 msgid "" "The directory tree from where atftpd can serve files. That directory must be " "world readable." msgstr "" -"Katalogträdet som atftpd tillhandahåller filer från. Katalogen måste vara " -"läsbar för alla." +"Katalogträdet med filer som atftpd erbjuder. Katalogen måste vara läsbar av " +"alla." --- atftp-0.7.dfsg.orig/debian/po/pl.po +++ atftp-0.7.dfsg/debian/po/pl.po @@ -0,0 +1,215 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2004-12-28 16:34+0100\n" +"Last-Translator: Bartosz Fenski \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Czy serwer ma byæ uruchamiany przez inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd mo¿e byæ uruchamiany przez superserwer inetd lub mo¿e pracowaæ jako " +"demon i samemu akceptowaæ po³±czenia. Drugie rozwi±zanie jest zalecane w " +"przypadku intensywnego wykorzystywania." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Limit czasu odpowiedzi na ¿±dania:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Ilo¶æ sekund oczekiwania g³ównego w±tku zanim zostanie zatrzymany." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Limit czasu potwierdzenia:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Ilo¶æ sekund oczekiwania na odpowied¼ przed ponown± transmisj± pakietu." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maksymalna ilo¶æ w±tków:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Maksymalna ilo¶æ jednocze¶nie uruchomionych w±tków." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Poziom gadatliwo¶ci:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Poziom rejestrowania. 7 rejestruje wszystko, ³±cznie z komunikatami " +"diagnostycznymi. 1 bêdzie rejestrowa³ jedynie wydarzenia krytyczne dla " +"systemu. 5 (LOG_NOTICE) jest warto¶ci± domy¶ln±." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "W³±czyæ obs³ugê 'limitu czasu'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "W³±czyæ obs³ugê 'tsize'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "W³±czyæ obs³ugê 'block size'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "W³±czyæ obs³ugê multiemisji?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +#, fuzzy +msgid "TTL for multicast packets:" +msgstr "TTL dla pakietów multiemisji" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port nas³uchiwania na ¿±dania tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Zakres portów dla multiemisji plików:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Multiemisja plików skorzysta z jakiegokolwiek wolnego portu z podanego " +"przedzia³u. Przyk³adowo \"2000-2003, 3000\" pozwoli atftpd u¿yæ portu 3000 " +"oraz portów z przedzia³u 2000-2003." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Zakres adresów dla multiemisji:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Multiemisja plików skorzysta z jakiegokolwiek adresu spo¶ród podanych. " +"Sk³adnia \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Rejestrowaæ zdarzenia do pliku zamiast do sysloga?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Je¶li Twój serwer jest mocno obci±¿ony, aktywacja tej mo¿liwo¶ci jest " +"zalecana. Dziêki temu zdarzenia tftpd nie zapchaj± Twojego sysloga." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Plik zdarzeñ:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Plik do którego atftpd bêdzie zapisywa³ zdarzenia. Plik bêdzie posiada³ " +"uprawnienia do zapisu przez u¿ytkownika 'nobody' i grupê 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Podstawowy katalog:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"Drzewo katalogów z których atftpd bêdzie móg³ serwowaæ pliki. Katalog musi " +"mieæ prawa odczytu dla wszystkich." --- atftp-0.7.dfsg.orig/debian/po/ru.po +++ atftp-0.7.dfsg/debian/po/ru.po @@ -0,0 +1,221 @@ +# translation of atftp_0.7.dfsg-1_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Yuri Kozlov , 2006. +msgid "" +msgstr "" +"Project-Id-Version: 0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2006-12-24 21:11+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "ЗапуÑкать Ñервер Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd может запуÑкатьÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑуперÑервера inetd или поÑтоÑнно работать " +"в режиме демона, Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°Ñ Ð²Ñ…Ð¾Ð´Ñщие ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑамоÑтоÑтельно. ПоÑледнее " +"рекомендуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ñлучае очень большой нагрузки на Ñервер." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ñервером:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "КоличеÑтво Ñекунд, которые будет ждать главный поток перед выходом." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ повтором:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"КоличеÑтво Ñекунд, в течении которых нужно ждать ответа перед тем как " +"повторить отправку пакета." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "МакÑимальное чиÑло потоков:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "" +"МакÑимальное чиÑло одновременно работающих потоков, которые могут быть " +"запущены." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Уровень детализации:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"ПодробноÑÑ‚ÑŒ журнальных Ñообщений. 7 -- запиÑываетÑÑ Ð²ÑÑ‘, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¾Ñ‚Ð»Ð°Ð´Ð¾Ñ‡Ð½Ñ‹Ðµ " +"ÑообщениÑ. 1 -- запиÑываютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑиÑтемные критичеÑкие ошибки. По " +"умолчанию уÑтановлено 5 (LOG_NOTICE)." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Включить поддержку 'timeout'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Включить поддержку 'tsize'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Включить поддержку 'block size'?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Включить поддержку широковещаниÑ?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL Ð´Ð»Ñ ÑˆÐ¸Ñ€Ð¾ÐºÐ¾Ð²ÐµÑ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… пакетов:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Ðомер порта, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ ожидаютÑÑ tftp запроÑÑ‹:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Диапазон портов Ð´Ð»Ñ ÑˆÐ¸Ñ€Ð¾ÐºÐ¾Ð²ÐµÑ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ файловой передачи:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"При широковещательной передаче будет иÑпользоватьÑÑ Ð»ÑŽÐ±Ð¾Ð¹ доÑтупный порт из " +"указанного набора. Ðапример, \"2000-2003, 3000\" позволÑет atftpd " +"иÑпользовать порты от 2000 до 2003 и 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Диапазон адреÑов Ð´Ð»Ñ ÑˆÐ¸Ñ€Ð¾ÐºÐ¾Ð²ÐµÑ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ передачи:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"При широковещательной передаче будут иÑпользованы любые доÑтупные адреÑа из " +"заданного набора. СинтакÑÐ¸Ñ -- \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "СохранÑÑ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² файл вмеÑто иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"ЕÑли Ñервер оперирует Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ количеÑтвом файлов, лучше ответить " +"утвердительно. Это поможет избежать Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ syslog ÑиÑтемы ÑообщениÑми от " +"tftpd." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Файл журнала:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñообщений от atftpd. Этот файл будет Ñоздан Ñ " +"правами запиÑи пользователю 'nobody' и группе 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Базовый каталог:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"Ðачальный каталог, в котором atftpd работает Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸. Этот каталог должен " +"быть доÑтупен вÑем на чтение." --- atftp-0.7.dfsg.orig/debian/po/da.po +++ atftp-0.7.dfsg/debian/po/da.po @@ -0,0 +1,213 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp 0.7-4\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2005-01-01 20:10+0200\n" +"Last-Translator: Morten Brix Pedersen \n" +"Language-Team: Danish \n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Skal serveren startes af inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd kan startes af inetd superserveren eller som en dæmon der hÃ¥ndterer " +"indgÃ¥ende forbindelser selv. Sidstnævnte er kun anbefalet for maskiner med " +"meget stort forbrug." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Server tidsgrænseudløb:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Hovr mange sekunder hoved-trÃ¥den venter før den afslutter." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Prøv-igen tidsgrænse:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "Hvor mange sekunder skal der ventes pÃ¥ svar, før en pakke gensendes." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maks antal trÃ¥de:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Maks antal samtidige trÃ¥de der kan køre." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Detalje-niveau:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Niveau til logning. 7 logger alt inklusive fejlsøgningslogs. 1 vil kun logge " +"system kritiske logs. 5 (LOG_NOTICE) er standardværdien." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Aktivér 'timeout'-understøttelse?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Aktivér 'tsize'-understøttelse?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Aktivér 'block size'-understøttelse?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Aktivér 'multicast'-understøttelse?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +#, fuzzy +msgid "TTL for multicast packets:" +msgstr "TTL for multicast-pakker" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port der skal lyttes pÃ¥ for tftp-efterspørgsler:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Port-omrÃ¥de for multicast fil-overførsler:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Multicast-overførsler vil kun bruge en tilgængelig port i et givent omrÃ¥de. " +"F.eks. \"2000-2003, 3000\" vil tillade aftftpd at bruge port 2000 til 2003, " +"og 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Adresse-omrÃ¥de for multicast overførsler:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Multicast-overførsler vil bruge tilgængelige adresser fra et givent omrÃ¥de " +"af adresser. Syntaksen er \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Log til en fil i stedet for syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Hvis din server laver intensivt tftp fil-deling, er det en god idé at svare " +"ja her. Det vil undgÃ¥ at fylde din syslog for meget op med tftpd beskeder." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Logfil:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"En fil hvor atftpd skriver sine logs. Denne fil vil blive gjort skrivbar for " +"brugeren 'nobody' og gruppen 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Base-mappe:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"Mappe-træet hvor atftpd kan servere sine filer. Denne mappe skal være læsbar " +"af alle." --- atftp-0.7.dfsg.orig/debian/po/pt_BR.po +++ atftp-0.7.dfsg/debian/po/pt_BR.po @@ -0,0 +1,215 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2005-02-26 14:07-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "O servidor deve ser iniciado pelo inetd ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"O atftpd pode ser iniciado pelo superservidor inetd ou como um daemon e " +"gerenciar conexões de entrada por si próprio. A última opção é recomendada " +"somente para servidores com uma taxa de utilização bem alta." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Timeout do servidor :" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Quantos segundos a thread principal deve aguardar antes de finalizar." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Timeout de nova tentativa :" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Quantos segundos aguardar por uma resposta antes de retransmitir um pacote." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Número máximo de threads :" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Número máximo de threads concorrentes que podem estar em execução." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Nível de verbosidade :" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Nível de logging. O nível 7 loga tudo incluíndo logs de depuração. O nível 1 " +"irá logar somente logs críticos do sistema. O nível 5 (LOG_NOTICE) é o valor " +"padrão." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Habilitar suporte a 'timeout' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Habilitar suporte a 'tsize' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Habilitar suporte a 'tamanho de bloco' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Habilitar suporte a multicast ?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +#, fuzzy +msgid "TTL for multicast packets:" +msgstr "TTL para pacotes multicast" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Porta na qual ouvir por requisições tftp :" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Faixa de portas para transferência de arquivos multicast :" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Transferências multicast utilizarão quaisquer portas em um dado conjunto. " +"Por exemplo, \"2000-2003, 3000\" permitirão ao atftpd utilizar as portas " +"2000 até 2003 e a porta 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Faixa de portas para transferências multicast :" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Transferências multicast utilizarão quaisquer endereços disponíveis de um " +"dado conjunto de endereços. A sintaxe é \"a.b.c.d-d,a.b.c.d, ...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Logar em arquivos ao invés de syslog ?' " + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Caso seu servidor sirva tftp intensivamente, é uma boa idéia aceitar essa " +"opção. Isso irá evitar encher seu syslog com logs tftpd." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Arquivo de log :" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Um arquivo onde o atftpd gravará seus logs. Esse arquivo deverá ter " +"permissão de gravação para o usuário 'nobody' e para o grupo 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Diretório base :" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"A árvore de diretórios a partir da qual o atftpd pode servir arquivos. Esse " +"diretório precisa ter permissão de gravação para todos." --- atftp-0.7.dfsg.orig/debian/po/es.po +++ atftp-0.7.dfsg/debian/po/es.po @@ -1,292 +1,238 @@ +# atftp po-debconf translation to spanish +# Copyright (C) 2006 Software in the Public Interest, SPI Inc. +# This file is distributed under the same license as the atftp package. # -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' +# Changes: +# - Initial translation +# Sergio Molina , 2004. +# Steve Lord Flaubert , 2006 +# +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Si tiene dudas o consultas sobre esta traducción consulte con el último +# traductor (campo Last-Translator) y ponga en copia a la lista de +# traducción de Debian al español () # -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans # -# Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-17 18:54-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: atftp 0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2006-12-06 22:26+0100\n" +"Last-Translator: Steve Lord Flaubert \n" +"Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description -#: ../atftpd.templates:4 -#, fuzzy -msgid "Do you want to configure the server?" -msgstr "¿Quiere configurar el servidor?" - -#. Type: boolean -#. Description -#: ../atftpd.templates:4 -#, fuzzy -msgid "" -"atftpd can have various parameters passed to it. These parameters can " -"optimize performances for servers that do heavy work. The default values are " -"suitable for most purposes." -msgstr "" -"A atftpd se le pueden pasar varios parámetros. Estos parámetros pueden " -"optimizar su rendimiento en servidores con mucha carga. Los valores por " -"defecto suelen ser adecuados en la mayoría de los casos." - -#. Type: boolean -#. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "Should the server be started by inetd?" -msgstr "" +msgstr "¿El servidor debería arrancarse por medio de inetd?" #. Type: boolean #. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "" "atftpd can be started by the inetd superserver or as a daemon and handle " "incoming connections by itself. The latter is only recommend for very high " "usage server." msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:19 -msgid "300" -msgstr "" +"atftpd puede iniciarse por medio del superservidor inetd o como un demonio y " +"manejar las conexiones entrantes por sí mismo. El segundo caso se recomienda " +"sólo para servidores con mucha carga de trabajo." #. Type: string #. Description -#: ../atftpd.templates:20 -#, fuzzy -msgid "Server timeout." -msgstr "Timeout del servidor." +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Tiempo excedido del servidor:" #. Type: string #. Description -#: ../atftpd.templates:20 -#, fuzzy +#: ../atftpd.templates:2001 msgid "How many seconds the main thread waits before exiting." msgstr "" -"Especifique cuántos segundos ha de esperar el hilo principal del programa " +"Especifique cuantos segundos ha de esperar el hilo principal del programa " "antes de finalizar." #. Type: string -#. Default -#: ../atftpd.templates:25 -msgid "5" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:26 -#, fuzzy -msgid "Retry timeout." -msgstr "Timeout de respuesta." +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Tiempo de espera para reintento:" #. Type: string #. Description -#: ../atftpd.templates:26 -#, fuzzy +#: ../atftpd.templates:3001 msgid "How many seconds to wait for a reply before retransmitting a packet." msgstr "" -"Especifique cuántos segundos se ha esperar una respuesta antes de volver a " -"enviar un paquete." - -#. Type: string -#. Default -#: ../atftpd.templates:31 -msgid "100" -msgstr "" +"Especifique cuantos segundos se ha de esperar una respuesta antes de volver " +"a enviar un paquete." #. Type: string #. Description -#: ../atftpd.templates:32 -#, fuzzy -msgid "Maximum number of threads." -msgstr "Máximo número de hilos." +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Máximo número de hilos:" #. Type: string #. Description -#: ../atftpd.templates:32 -#, fuzzy +#: ../atftpd.templates:4001 msgid "Maximum number of concurrent threads that can be running." -msgstr "Máximo número de hilos concurrentes que se puede ejecutar." - -#. Type: select -#. Choices -#: ../atftpd.templates:37 -msgid "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" -msgstr "" +msgstr "Máximo número de hilos concurrentes que se puede ejecutar." #. Type: select #. Description -#: ../atftpd.templates:39 -#, fuzzy -msgid "Verbosity level." -msgstr "Nivel de detalle de los registros." +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Nivel de detalle de los registros:" #. Type: select #. Description -#: ../atftpd.templates:39 -#, fuzzy +#: ../atftpd.templates:5001 msgid "" "Level of logging. 7 logs everything including debug logs. 1 will log only " "the system critical logs. 5 (LOG_NOTICE) is the default value." msgstr "" -"Nivel de registro: 7 lo guarda todo, incluyendo los logs de depuración. 1 " -"grabará sólo los registros críticos del sistema. 5 (LOG_NOTICE) es el valor " -"por omisión." +"Nivel de registro : 7 lo guarda todo, incluyendo los registros de " +"depuración. 1 grabará sólo los registros críticos del sistema. 5 " +"(LOG_NOTICE) es el valor por omisión." #. Type: boolean #. Description -#: ../atftpd.templates:46 -msgid "Enable 'timeout' support" -msgstr "" +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "¿Habilitar soporte «timeout»?" #. Type: boolean #. Description -#: ../atftpd.templates:51 -msgid "Enable 'tsize' support" -msgstr "" +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "¿Habilitar soporte «tsize»?" #. Type: boolean #. Description -#: ../atftpd.templates:56 -msgid "Enable 'block size' support" -msgstr "" +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "¿Habilitar soporte para «block-size»?" #. Type: boolean #. Description -#: ../atftpd.templates:61 -msgid "Enable 'multicast' support" -msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:65 -msgid "69" -msgstr "" +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "¿Habilitar soporte «multicast»?" #. Type: string #. Description -#: ../atftpd.templates:66 -msgid "Port to listen for tftp request" -msgstr "" +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL para paquetes multicast:" #. Type: string -#. Default -#: ../atftpd.templates:70 -msgid "1758" -msgstr "" +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Puerto para escuchar peticiones de tftp:" #. Type: string #. Description -#: ../atftpd.templates:71 -msgid "Port range for multicast file transfer" -msgstr "" +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Rango de puertos para transferencia de archivos multicast:" #. Type: string #. Description -#: ../atftpd.templates:71 +#: ../atftpd.templates:12001 msgid "" "Multicast transfer will use any available port in a given set. For example, " "\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." msgstr "" - -#. Type: string -#. Default -#: ../atftpd.templates:77 -msgid "239.255.0.0-255" -msgstr "" +"Las transferencias multicast usan cualquier puerto disponible entre un rango " +"de puertos asignados. Por ejemplo, «2000-2003, 3000» permite a atftpd " +"utilizar cualquier puerto entre el 2000 al 2003 y el puerto 3000." #. Type: string #. Description -#: ../atftpd.templates:78 -msgid "Address range for multicast transfer" -msgstr "" +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Rango de direcciones para transferencia multicast:" #. Type: string #. Description -#: ../atftpd.templates:78 +#: ../atftpd.templates:13001 msgid "" "Multicast transfer will use any available addresses from a given set of " "addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" msgstr "" +"Las transferencias multicast usarán cualquier dirección disponible de un " +"rango de direcciones asignadas. La sintaxis es «a.b.c.d-d,a.b.c.d,...»" #. Type: boolean #. Description -#: ../atftpd.templates:85 -#, fuzzy +#: ../atftpd.templates:14001 msgid "Log to file instead of syslog?" -msgstr "¿Grabar los registros en un fichero en lugar de usar syslog?" +msgstr "¿Fichero de registro en lugar de syslog?" #. Type: boolean #. Description -#: ../atftpd.templates:85 -#, fuzzy +#: ../atftpd.templates:14001 msgid "" -"If your server does intensive tftp file serving, it is a good idea to say " -"yes. That will avoid to clutter your syslog with tftpd logs." +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." msgstr "" "Si su servidor realiza transferencias intensivas de ficheros mediante tftp, " -"es una buena idea responder sí. Esto evitará que desborde su syslog con " +"es una buena idea aceptar aquí. Esto evitará que desordene su «syslog» con " "registros de tftpd." #. Type: string -#. Default -#: ../atftpd.templates:91 -msgid "/var/log/atftpd.log" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:92 -#, fuzzy -msgid "Log file." -msgstr "Fichero de registro." +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Fichero de registro:" #. Type: string #. Description -#: ../atftpd.templates:92 -#, fuzzy +#: ../atftpd.templates:15001 msgid "" -"A file where atftpd write its logs. This file will be made writable for the " -"user 'nobody' and group 'nogroup'." -msgstr "" -"El fichero en el que tftpd escribirá sus logs. En este fichero podrá " -"escribir el usuario 'nobody' y los usuarios del grupo 'nogroup'." - -#. Type: string -#. Default -#: ../atftpd.templates:98 -msgid "/tftpboot" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." msgstr "" +"Un fichero en el que tftpd escribirá sus registros. Este fichero se hará " +"escribible al usuario «nobody» y los usuarios del grupo «nogroup»." #. Type: string #. Description -#: ../atftpd.templates:99 -#, fuzzy -msgid "Base directory." -msgstr "Directorio base." +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Directorio base:" #. Type: string #. Description -#: ../atftpd.templates:99 -#, fuzzy +#: ../atftpd.templates:16001 msgid "" "The directory tree from where atftpd can serve files. That directory must be " "world readable." msgstr "" -"El árbol de directorios a partir del cual servirá los ficheros atftpd. Ese " -"directorio tiene que tener derechos de lectura para todos los usuarios." +"El árbol de directorios desde dónde atftpd servirá los ficheros. Ese " +"directorio debe ser accesible para todos los usuarios." --- atftp-0.7.dfsg.orig/debian/po/ca.po +++ atftp-0.7.dfsg/debian/po/ca.po @@ -0,0 +1,210 @@ +# +# Catalan translation for atftp package. +# Copyright (C) 2007 Ludovic Droviz. +# This file is distributed under the same license as the atftp package. +# +# Jordà Polo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2007-02-04 23:05+0100\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Català \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "S'hauria d'iniciar el servidor mitjançant inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"És possible iniciar atftpd mitjançant el superservidor inetd o com a dimoni, " +"deixant que aquest controli les connexions entrants. La darrera opció només " +"es recomana en servidors amb molta càrrega." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Temps d'espera del servidor:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Els segons que s'ha d'esperar el fil principal abans d'acabar." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Temps d'espera dels reintents:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Els segons que s'ha d'esperar una resposta abans de tornar a transmetre un " +"paquet." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Nombre màxim de fils:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Nombre màxim de fils que poden executar-se concurrentment." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Nivell de detall:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Nivell de registre. «7» ho enregistra tot, incloent missatges de depuració. " +"«1» només enregistrarà els missatges crítics del sistema. «5» (LOG_NOTICE) " +"és el valor predeterminat." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Voleu activar el suport per a «timeout»?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Voleu activar el suport per a «tsize»?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Voleu activar el suport per a «block size»?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Voleu activar el suport multicast?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL per als paquets multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port on s'han d'escoltar les peticions tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Rang de ports per a la transmissió de fitxers multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Les transferències multicast utilitzaran qualsevol port disponible dins un " +"cert rang. Per exemple, «2000-2003, 3000» permet utilitzar els ports entre " +"el 2000 i el 2003, i el 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Rang d'adreces per a la transmissió multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Les transferències multicast utilitzaran qualsevol adreça disponible dins un " +"cert rang. La sintaxi és «a.b.c.d-d,a.b.c.d,...»." + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Voleu enregistrar en un fitxer en lloc d'utilitzar syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Si el vostre servidor suporta una intensa càrrega de transmissió de fitxers " +"per tftp, seria una bona idea acceptar aquesta opció. Això evitarà emplenar " +"el syslog amb els registres relacionats amb tftpd." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Fitxer de registre:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"El fitxer on atftpd escriurà els seus registres. L'usuari «nobody» i el grup " +"«nogroup» tindran permisos d'escriptura sobre aquest fitxer." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Directori base:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"El directori des del qual atftpd ha de servir els fitxers. Aquest directori " +"ha de tenir permisos de lectura per a tothom." --- atftp-0.7.dfsg.orig/debian/po/de.po +++ atftp-0.7.dfsg/debian/po/de.po @@ -1,283 +1,222 @@ +# translation of po-debconf template to German # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to # this format, e.g. by running: # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' -# # Some information specific to po-debconf are available at # /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# # Developers do not need to manually edit POT or PO files. # -#, fuzzy +# Jens Nachtigall , 2004. +# Matthias Julius , 2006. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-17 18:54-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: atftp 0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2006-11-23 01:10-0500\n" +"Last-Translator: Matthias Julius \n" +"Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean #. Description -#: ../atftpd.templates:4 -msgid "Do you want to configure the server?" -msgstr "Wollen Sie den Server konfigurieren?" - -#. Type: boolean -#. Description -#: ../atftpd.templates:4 -msgid "" -"atftpd can have various parameters passed to it. These parameters can " -"optimize performances for servers that do heavy work. The default values are " -"suitable for most purposes." -msgstr "" -"atftpd kann mit verschiedenen Parametern gestartet werden. Diese Parameter " -"können die Leistung intensiv genutzter Server erhöhen. Die Standartwerte " -"sind für die meisten Anwendungsgebiete geeignet." - -#. Type: boolean -#. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "Should the server be started by inetd?" msgstr "Soll der Server von inetd gestartet werden?" #. Type: boolean #. Description -#: ../atftpd.templates:12 +#: ../atftpd.templates:1001 msgid "" "atftpd can be started by the inetd superserver or as a daemon and handle " "incoming connections by itself. The latter is only recommend for very high " "usage server." msgstr "" -"atftpd kann durch den inetd Hauptserver oder als 'Daemon' gestartet werden " -"und selbst externe Verbindungsaufnahmen verwalten. Letzteres ist nur bei " +"atftpd kann durch den Hauptserver inetd oder als Daemon gestartet werden, um " +"so selbst externe Verbindungsaufnahmen zu verwalten. Letzteres ist nur bei " "sehr stark genutzten Servern empfehlenswert." #. Type: string -#. Default -#: ../atftpd.templates:19 -msgid "300" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:20 -msgid "Server timeout." -msgstr "Server 'timeout'." +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Server-Limit für Zeitüberschreitung (engl. »server timeout«)." #. Type: string #. Description -#: ../atftpd.templates:20 +#: ../atftpd.templates:2001 msgid "How many seconds the main thread waits before exiting." -msgstr "Die Zeit in Sekunden, die der Hauptprozess vor dem Beenden abwartet." - -#. Type: string -#. Default -#: ../atftpd.templates:25 -msgid "5" -msgstr "" +msgstr "Die Zeit in Sekunden, die der Haupt-Thread vor einem Abbruch abwartet." #. Type: string #. Description -#: ../atftpd.templates:26 -msgid "Retry timeout." -msgstr "'Retry timeout'" +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "" +"Server-Limit für Zeitüberschreitung bei neuerlichem Versuch (engl. »Retry " +"timeout«)." #. Type: string #. Description -#: ../atftpd.templates:26 +#: ../atftpd.templates:3001 msgid "How many seconds to wait for a reply before retransmitting a packet." msgstr "" -"Die Zeit in Sekunden, die der Server verstreichen lässt, bevor das zuletzt " -"gesendete Paket erneut übertragen wird" - -#. Type: string -#. Default -#: ../atftpd.templates:31 -msgid "100" -msgstr "" +"Die Zeit in Sekunden, die der Server verstreichen lässt, bevor das zuletzt " +"gesendete Paket erneut übertragen wird." #. Type: string #. Description -#: ../atftpd.templates:32 -msgid "Maximum number of threads." -msgstr "Maximale Anzahl von Prozessen." +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Maximale Thread-Anzahl:" #. Type: string #. Description -#: ../atftpd.templates:32 +#: ../atftpd.templates:4001 msgid "Maximum number of concurrent threads that can be running." -msgstr "Die maximale Anzahl gleichzeitig erlaubter Prozesse." - -#. Type: select -#. Choices -#: ../atftpd.templates:37 -msgid "7 (LOG_DEBUG), 6 (LOG_INFO), 5 (LOG_NOTICE), 4 (LOG_WARNING)" -msgstr "" +msgstr "Die maximale Anzahl gleichzeitig laufender Threads." #. Type: select #. Description -#: ../atftpd.templates:39 -msgid "Verbosity level." -msgstr "Niveau der Redseligkeit." +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Niveau der Redseligkeit:" #. Type: select #. Description -#: ../atftpd.templates:39 +#: ../atftpd.templates:5001 msgid "" "Level of logging. 7 logs everything including debug logs. 1 will log only " "the system critical logs. 5 (LOG_NOTICE) is the default value." msgstr "" -"Intensität des Loggens. 7 loggt alles inklusive der 'debug' Meldungen. 1 " -"loggt lediglich die systemkritischen Meldungen. 5 {LOG_NOTICE} ist der " -"Standartwert." +"Intensität des Protokollierens. 7 protokolliert alles inklusive der »debug«-" +"Meldungen. 1 protokolliert lediglich die systemkritischen Meldungen. 5 " +"(LOG_NOTICE) ist der Standardwert." #. Type: boolean #. Description -#: ../atftpd.templates:46 -msgid "Enable 'timeout' support" -msgstr "Aktivieren der 'timeout' Unterstützung" +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Aktivieren der Zeitüberschreitungs-Unterstützung (engl. »timeout«)?" #. Type: boolean #. Description -#: ../atftpd.templates:51 -msgid "Enable 'tsize' support" -msgstr "Aktivieren der 'tsize' Unterstützung" +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Aktivieren der »tsize«-Unterstützung?" #. Type: boolean #. Description -#: ../atftpd.templates:56 -msgid "Enable 'block size' support" -msgstr "Aktivieren der 'block size' Unterstützung" +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Aktivieren der »block size«-Unterstützung?" #. Type: boolean #. Description -#: ../atftpd.templates:61 -msgid "Enable 'multicast' support" -msgstr "Aktivieren der 'multicast' Unterstützung" - -#. Type: string -#. Default -#: ../atftpd.templates:65 -msgid "69" -msgstr "" +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Multicast-Unterstützung aktivieren?" #. Type: string #. Description -#: ../atftpd.templates:66 -msgid "Port to listen for tftp request" -msgstr "Port, der auf eine tftp Anfrage überwacht wird" +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL für Multicast-Pakete:" #. Type: string -#. Default -#: ../atftpd.templates:70 -msgid "1758" -msgstr "" +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Port, der für tftp-Anfragen überwacht werden soll:" #. Type: string #. Description -#: ../atftpd.templates:71 -msgid "Port range for multicast file transfer" -msgstr "Portbereich für 'multicast' Dateitransfers" +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Portbereich für Multicast-Dateiübertragungen:" #. Type: string #. Description -#: ../atftpd.templates:71 +#: ../atftpd.templates:12001 msgid "" "Multicast transfer will use any available port in a given set. For example, " "\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." msgstr "" -"'Multicast' Transfers werden jeden verfügbaren Port aus der angegebenen " -"Auswahl verwenden. Die Angabe \"2000-2003, 3000\" erlaubt atftpd " +"Multicast-Transfers werden jeden verfügbaren Port aus der angegebenen " +"Auswahl verwenden. Die Angabe »2000-2003, 3000« erlaubt atftpd " "beispielsweise, die Ports 2000 bis 2003 sowie 3000 zu benutzen." #. Type: string -#. Default -#: ../atftpd.templates:77 -msgid "239.255.0.0-255" -msgstr "" - -#. Type: string #. Description -#: ../atftpd.templates:78 -msgid "Address range for multicast transfer" -msgstr "Adressbereich für den 'multicast' Transfer" +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Adressbereich für den Multicast-Transfer:" #. Type: string #. Description -#: ../atftpd.templates:78 +#: ../atftpd.templates:13001 msgid "" "Multicast transfer will use any available addresses from a given set of " "addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" msgstr "" -"'Multicast' Transfers werden jede verfügbare Adresse aus einer vorgegebenen " -"Auswahl verwenden. Die Syntax lautet \"a.b.c.d-d,a.b.c.d,...\"" +"Multicast-Transfers werden jede verfügbare Adresse aus der angegebenen " +"Auswahl verwenden. Die Syntax lautet »a.b.c.d-d,a.b.c.d,...«" #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "Log to file instead of syslog?" -msgstr "In eine Datei anstatt in das syslog schreiben?" +msgstr "In eine Datei anstatt über syslog protokollieren?" #. Type: boolean #. Description -#: ../atftpd.templates:85 +#: ../atftpd.templates:14001 msgid "" -"If your server does intensive tftp file serving, it is a good idea to say " -"yes. That will avoid to clutter your syslog with tftpd logs." -msgstr "" -"Falls Ihr Server intensiv zur tftp Bereitstellung von Dateien genutzt wird, " -"so ist es eine gute Idee, hier mit Ja zu antworten. Dies wird es vermeiden, " -"Ihr syslog mit tftp Meldungen zuzumüllen." - -#. Type: string -#. Default -#: ../atftpd.templates:91 -msgid "/var/log/atftpd.log" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." msgstr "" +"Falls Ihr Server viel bzw. oft Dateien mittels tftp bereitstellt, ist es " +"eine gute Idee, hier zuzustimmen. Dadurch wird Ihr syslog nicht mit tftp-" +"Meldungen überladen." #. Type: string #. Description -#: ../atftpd.templates:92 -msgid "Log file." -msgstr "Logdatei." +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Logdatei:" #. Type: string #. Description -#: ../atftpd.templates:92 +#: ../atftpd.templates:15001 msgid "" -"A file where atftpd write its logs. This file will be made writable for the " -"user 'nobody' and group 'nogroup'." -msgstr "" -"Eine Datei, in die atftpd seine Meldungen schreibt. Diese Datei wird für den " -"Benutzer 'nobody' und die Gruppe 'nogroup' mit Lese-Schreibzugriff zur " -"Verfügung gestellt werden." - -#. Type: string -#. Default -#: ../atftpd.templates:98 -msgid "/tftpboot" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." msgstr "" +"Eine Datei, in die atftpd seine Log-Meldungen schreibt. Diese Datei wird für " +"den Benutzer »nobody« und die Gruppe »nogroup« mit Schreibzugriff versehen " +"werden." #. Type: string #. Description -#: ../atftpd.templates:99 -msgid "Base directory." -msgstr "Stammverzeichnis." +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Basisverzeichnis:" #. Type: string #. Description -#: ../atftpd.templates:99 +#: ../atftpd.templates:16001 msgid "" "The directory tree from where atftpd can serve files. That directory must be " "world readable." msgstr "" -"Der Verzeichnisbaum, in dem atftpd Dateien zur Verfügung stellen kann. " -"Dieses Verzeichnis muss für alle Benutzer lesbar sein." +"Der Verzeichnisbaum, aus dem atftpd Dateien zur Verfügung stellen kann. " +"Dieses Verzeichnis muss für alle Benutzer lesbar sein." --- atftp-0.7.dfsg.orig/debian/po/it.po +++ atftp-0.7.dfsg/debian/po/it.po @@ -0,0 +1,207 @@ +# Italian (it) translation of debconf templates for atftp +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the atftp package. +# Luca Monducci , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp 0.7 italian debconf templates\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2007-05-04 20:31+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Avviare il server per mezzo di inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"È possibile avviare atftpd per mezzo del superserver inetd oppure come un " +"demone per gestire in modo autonomo le proprie connessioni. La seconda " +"opzione è raccomandata solo per server con un carico elevato." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Timeout del server:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "" +"Quanti secondi attendere la chiusura del thread principale prima di uscire." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Timeout di ritrasmissione:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Quanti secondi attendere una risposta prima di ritrasmettere un pacchetto." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Numero massimo di thread:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Numero massimo di thread concorrenti che possono essere in esecuzione." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Livello di verbosità:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Livello di log. Con 7 è registrato tutto, comprese le voci per il debug. Con " +"1 sono registrati solo gli eventi critici per il sistema. Il valore " +"predefinito è 5 (LOG_NOTICE)." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Attivare il supporto per \"timeout\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Attivare il supporto per \"tsize\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Attivare il supporto per \"block size\"?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Attivare il supporto per il multicast?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL per i pacchetti in multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Porta su cui stare in ascolto di richieste tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Intervallo di porte per trasferimenti di file in multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"I trasferimenti in multicast usano tutte le porte disponibili " +"nell'intervallo. Per esempio \"2000-2003, 3000\" indica a atftpd di usare le " +"porte dalla 2000 alla 2003 e la porta 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Intervallo di indirizzi per trasferimenti di file in multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"I trasferimenti in multicast usano tutti gli indirizzi disponibili " +"nell'intervallo specificato. La sintassi da usare è \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Crare un file di log al posto del syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Se il proprio server serve intensivamente dei file via tftp, è consigliabile " +"accettare. Questo evita di fare disordine nel syslog con i log di tftp." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "File di log:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"File su cui atftpd scrive il proprio log; è necessario che su questo file " +"abbiano permessi di scrittura l'utente \"noboby\" e il gruppo \"nogroup\"." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Directory di base:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"L'albero di directory dal quale atftpd può servire i file. Chiunque deve " +"poter leggere in questa directory." --- atftp-0.7.dfsg.orig/debian/po/pt.po +++ atftp-0.7.dfsg/debian/po/pt.po @@ -0,0 +1,207 @@ +# translation of atftp debconf to Portuguese +# 2005-12-06 - Marco Ferra (initial translation) +# Américo Monteiro , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp 0.7.dfsg-2\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2007-09-23 08:35+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Deve o servidor be iniciado pelo inetd?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"O atftpd pode ser iniciado pelo super-servidor inetd ou como um daemon e " +"lidar com todas as conexões por si próprio. Esta última hipótese é apenas " +"recomendada para um uso intensivo do servidor." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Timeout do servidor:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Quantos segundos deve a thread principal esperar antes de sair." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Timeout de tentiva:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "" +"Quantos segundos deve esperar por uma resposta antes de retransmitir um " +"pacote." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Número máximo de threads:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Número máximo de threads concorrentes que podem estar a correr." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Nível de detalhe:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Níveis de detalhe a ser registado. 7 grava tudo incluíndo texto de debug. 1 " +"grava apenas texto crítico de sistema. 5 (LOG_NOTICE) é o valor por omissão." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Activar o suporte de 'timeout' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Activar o suporte de 'tsize' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Activar o suporte de 'block size' ?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Activar o suporte multicast?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "TTL para os pacotes multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Porto de escuta para um pedido tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Gama de portos para uma transferência de ficheiros por multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"A transferência multicast irá usar qualquer porto livre dentro de uma " +"determinada gama. Por exemplo: \"2000-2003, 3000\" permitirá o atftpd usar " +"os portos de 2000 a 2004 e o 3000." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Gama de endereços para a transferência multicast:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"A transferência multicast irá usar qualquer endereço livre dentro de uma " +"determinada gama. A sintaxe é: \"a.b.c.d-d,a.b.c.d,...\"" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Fazer log para um ficheiro em vez de usar o syslog?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Se o seu servidor não faz um uso intensivo de pedidos de ficheiros por tftp " +"é boa ideia aceitar aqui. Isso irá evitar encher de dados inúteis o log do " +"syslog." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Ficheiro de log:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"O ficheiro no qual o atftpd irá gravar os seus logs. Este ficheiro terá as " +"permissões de utilizador 'nobody' e grupo 'nogroup'." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "Directório base:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"O caminho inicial pelo qual o atftpd irá servir os seus ficheiros. Esse " +"directório deve poder ser lido por qualquer utilizador." --- atftp-0.7.dfsg.orig/debian/po/vi.po +++ atftp-0.7.dfsg/debian/po/vi.po @@ -0,0 +1,208 @@ +# Vietnamese translation for atftp. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: atftp 0.7-8\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2005-06-12 12:09+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "Trình inetd nên khởi chạy trình há»— trợ này không?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"Trình siêu há»— trợ inetd có thể khởi chạy trình atftpd, hoặc trình atftpd có " +"thể khởi chạy là trình ná»n (daemon) nên tá»± nó quản lý má»i kết nối đến vào. " +"Chỉ khuyên tùy chá»n thứ hai khi trình há»— trợ bận lắm." + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "Thá»i hạn trình há»— trợ:" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "Mạch chính sẽ Ä‘á»i số giây này trÆ°á»›c khi thoát." + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "Thá»i hạn thá»­ lại:" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "Số giây sẽ chá» trả lá»i trÆ°á»›c khi truyá»n lại gói tin." + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "Số mạch tối Ä‘a:" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "Số tối Ä‘a mạch có chạy đồng thá»i." + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "Mức Ä‘á»™ chi tiết:" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"Mức Ä‘á»™ ghi lÆ°u dữ liệu. Mức Ä‘á»™ 7 sẽ ghi lÆ°u má»i dữ liệu gồm bản ghi gỡ lá»—i. " +"Mức Ä‘á»™ 1 sẽ chỉ ghi lÆ°u những bản ghi hệ thống nghiệm trá»ng. Giá trị mặc " +"định là 5 (LOG_NOTICE) [ghi thông báo]." + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "Hiệu lá»±c há»— trợ «thá»i hạn» không?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "Hiệu lá»±c há»— trợ «t-cỡ» không?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "Hiệu lá»±c há»— trợ «cỡ khối» không?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "Hiệu lá»±c há»— trợ «truyá»n má»™t-nhiá»u» không?" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +#, fuzzy +msgid "TTL for multicast packets:" +msgstr "Thá»i gian sóng cho gói tin truyá»n má»™t-nhiá»u" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "Cổng cần lắng nghe yêu cầu tftp:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "Phạm vị cổng để truyá»n tập tin má»™t-nhiá»u:" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"Truyá»n má»™t-nhiá»u sẽ sá»­ dụng bất cứ cổng sẵn sàng nào trong má»™t bá»™ đã cho. " +"Lấy thí dụ, «2000-2003, 3000» cho phép trình atftpd sá»­ dụng các cổng từ 2000 " +"đến 2003 và cổng 3000 Ä‘á»u." + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "Phạm vị địa chỉ để truyá»n má»™t-nhiá»u:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"Truyá»n má»™t-nhiá»u sẽ sá»­ dụng bất cứ địa chỉ sẵn sàng nào trong má»™t bá»™ đã cho. " +"Cú pháp là:\n" +"a.b.c.d-d,a.b.c.d,..." + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "Ghi lÆ°u vào tập tin thay vào «syslog» (bản ghi hệ thống) không?" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"Nếu trình phục vụ của bạn cung cấp dịch vụ tập tin rất nhiá»u thì đệ nghị bạn " +"chấp nhận tùy chá»n này. Làm nhÆ° thế sẽ tránh làm bản ghi hệ thống bừa bá»™n " +"các bản ghi «tftpd»." + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "Tập tin bản ghi:" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"Tập tin nÆ¡i trình «atftpd» sẽ ghi dữ liệu theo dõi của nó. Tập tin này sẽ " +"cho phép ngÆ°á»i dùng «không ai» và nhóm «không nhóm» ghi vào nó." + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "ThÆ° mục cÆ¡ bản:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"Cây thÆ° mục nÆ¡i trình «atftpd» có thể cung cấp dịch vụ tập tin từ nó. ThÆ° " +"mục ấy phải cho phép thế giá»›i Ä‘á»c nó." --- atftp-0.7.dfsg.orig/debian/po/ja.po +++ atftp-0.7.dfsg/debian/po/ja.po @@ -0,0 +1,212 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: atftp 0.7.dfsg-1\n" +"Report-Msgid-Bugs-To: ldrolez@debian.org\n" +"POT-Creation-Date: 2006-10-02 00:46+0200\n" +"PO-Revision-Date: 2006-12-12 01:47+0900\n" +"Last-Translator: Atsushi Shimono \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "Should the server be started by inetd?" +msgstr "inetd をサーãƒã®èµ·å‹•ã«åˆ©ç”¨ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: boolean +#. Description +#: ../atftpd.templates:1001 +msgid "" +"atftpd can be started by the inetd superserver or as a daemon and handle " +"incoming connections by itself. The latter is only recommend for very high " +"usage server." +msgstr "" +"atftpd ã¯ã€inetd ã‹ã‚‰èµ·å‹•ã™ã‚‹ã‹ã€ã‚‚ã—ãã¯ãƒ‡ãƒ¼ãƒ¢ãƒ³ã¨ã—ã¦å‹•ä½œã—接続を自分ã§å‡¦ç†" +"ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚後者ã¯ã€é«˜è² è·ã®ã‚µãƒ¼ãƒã§æŽ¨å¥¨ã•ã‚Œã¾ã™ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "Server timeout:" +msgstr "サーãƒã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆå€¤ :" + +#. Type: string +#. Description +#: ../atftpd.templates:2001 +msgid "How many seconds the main thread waits before exiting." +msgstr "メインã®ã‚¹ãƒ¬ãƒƒãƒ‰ã‚’終了ã™ã‚‹ã¾ã§ä½•ç§’å¾…æ©Ÿã•ã›ã‚‹ã‹ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "Retry timeout:" +msgstr "リトライ時ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆå€¤ :" + +#. Type: string +#. Description +#: ../atftpd.templates:3001 +msgid "How many seconds to wait for a reply before retransmitting a packet." +msgstr "パケットã®å†é€ã¾ã§ä½•ç§’å¾…ã¤ã‹ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of threads:" +msgstr "最大スレッド数 :" + +#. Type: string +#. Description +#: ../atftpd.templates:4001 +msgid "Maximum number of concurrent threads that can be running." +msgstr "åŒæ™‚ã«å‹•ä½œã•ã›ã‚‹æœ€å¤§ã®ã‚¹ãƒ¬ãƒƒãƒ‰æ•°ã€‚" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "Verbosity level:" +msgstr "冗長レベル :" + +#. Type: select +#. Description +#: ../atftpd.templates:5001 +msgid "" +"Level of logging. 7 logs everything including debug logs. 1 will log only " +"the system critical logs. 5 (LOG_NOTICE) is the default value." +msgstr "" +"ログ出力ã®ãƒ¬ãƒ™ãƒ«ã€‚7 ã§ã¯ãƒ‡ãƒãƒƒã‚°ãƒ­ã‚°ã‚’å«ã‚€ã™ã¹ã¦ã®ãƒ­ã‚°ã‚’出力。1 ã§ã¯ã€ã‚·ã‚¹ãƒ†" +"ムã®é‡å¤§ãªãƒ­ã‚°ã®ã¿ã‚’出力。 5 (LOG_NOTICE) ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã€‚" + +#. Type: boolean +#. Description +#: ../atftpd.templates:6001 +msgid "Enable 'timeout' support?" +msgstr "'タイムアウト'を有効ã«ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: boolean +#. Description +#: ../atftpd.templates:7001 +msgid "Enable 'tsize' support?" +msgstr "'tsize'を有効ã«ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: boolean +#. Description +#: ../atftpd.templates:8001 +msgid "Enable 'block size' support?" +msgstr "'ブロックサイズ'を有効ã«ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: boolean +#. Description +#: ../atftpd.templates:9001 +msgid "Enable multicast support?" +msgstr "マルãƒã‚­ãƒ£ã‚¹ãƒˆã‚’有効ã«ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: string +#. Description +#: ../atftpd.templates:10001 +msgid "TTL for multicast packets:" +msgstr "マルãƒã‚­ãƒ£ã‚¹ãƒˆãƒ‘ケット㮠TTL 値" + +#. Type: string +#. Description +#: ../atftpd.templates:11001 +msgid "Port to listen for tftp request:" +msgstr "tftp ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å¾…ã¡å—ã‘ã‚‹ãƒãƒ¼ãƒˆç•ªå· :" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "Port range for multicast file transfer:" +msgstr "マルãƒã‚­ãƒ£ã‚¹ãƒˆè»¢é€ã«åˆ©ç”¨ã™ã‚‹ãƒãƒ¼ãƒˆç•ªå·ã®ç¯„囲 :" + +#. Type: string +#. Description +#: ../atftpd.templates:12001 +msgid "" +"Multicast transfer will use any available port in a given set. For example, " +"\"2000-2003, 3000\" allow atftpd to use port 2000 to 2003 and 3000." +msgstr "" +"マルãƒã‚­ãƒ£ã‚¹ãƒˆè»¢é€ã¯è¨­å®šã•ã‚ŒãŸç•ªå·ã®ã†ã¡åˆ©ç”¨ã§ãã‚‹ãƒãƒ¼ãƒˆã‚’利用ã—ã¾ã™ã€‚例ãˆã°" +"\"2000-2003, 3000\"を設定ã™ã‚‹ã¨ã€atftpd ã¯ã€2000 ã‹ã‚‰ 2003 㨠3000 番を利用ã—" +"ã¾ã™ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "Address range for multicast transfer:" +msgstr "マルãƒã‚­ãƒ£ã‚¹ãƒˆè»¢é€å…ˆã®ã‚¢ãƒ‰ãƒ¬ã‚¹ç¯„囲:" + +#. Type: string +#. Description +#: ../atftpd.templates:13001 +msgid "" +"Multicast transfer will use any available addresses from a given set of " +"addresses. Syntax is \"a.b.c.d-d,a.b.c.d,...\"" +msgstr "" +"マルãƒã‚­ãƒ£ã‚¹ãƒˆè»¢é€ã¯é€ä¿¡å…ˆã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã«è¨­å®šã•ã‚ŒãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¾ã™ã€‚設定å¯" +"能ãªã‚·ãƒ³ã‚¿ãƒƒã‚¯ã‚¹ã¯ã€\"a.b.c.d-d,a.b.c.d,...\"ã§ã™ã€‚" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "Log to file instead of syslog?" +msgstr "ログを syslog ã§ãªãファイルã«æ›¸ã出ã—ã¾ã™ã‹ï¼Ÿ" + +#. Type: boolean +#. Description +#: ../atftpd.templates:14001 +msgid "" +"If your server does intensive tftp file serving, it is a good idea to " +"accept here. That will avoid cluttering your syslog with tftpd logs." +msgstr "" +"サーãƒãŒå¤§é‡ã® tftp 転é€ã‚’è¡Œã†å ´åˆã€ã“れを有効ã«ã™ã‚‹ã®ã¯ã‚ˆã„アイデアã§ã™ã€‚" +"tftpd ã®ãƒ­ã‚°ã«ã‚ˆã£ã¦ syslog ãŒä¹±é›‘ã«ãªã‚‹ã“ã¨ãŒãªããªã‚Šã¾ã™ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "Log file:" +msgstr "ログファイルå :" + +#. Type: string +#. Description +#: ../atftpd.templates:15001 +msgid "" +"A file where atftpd will write its logs. This file will be made writable for " +"the user 'nobody' and group 'nogroup'." +msgstr "" +"aftpd ãŒãƒ­ã‚°ã‚’書ã出ã™ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€'nobody' ユーザ㨠" +"'nobody' グループã«å¯¾ã—ã¦æ›¸ãè¾¼ã¿å¯èƒ½ãªçŠ¶æ…‹ã§ä½œæˆã•ã‚Œã¾ã™ã€‚" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "Base directory:" +msgstr "ベースディレクトリ:" + +#. Type: string +#. Description +#: ../atftpd.templates:16001 +msgid "" +"The directory tree from where atftpd can serve files. That directory must be " +"world readable." +msgstr "" +"aftpd ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚’æä¾›ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯èª°ã‹ã‚‰ã§ã‚‚読ã‚" +"るよã†ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" --- atftp-0.7.dfsg.orig/test/Makefile.in +++ atftp-0.7.dfsg/test/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -227,20 +227,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi