diff options
author | Martin Quinson <martin.quinson@loria.fr> | 2013-12-08 21:53:26 +0100 |
---|---|---|
committer | Martin Quinson <martin.quinson@loria.fr> | 2013-12-08 21:53:26 +0100 |
commit | eeb69930c83314c4ebf659f82cd28241b6b79e7b (patch) | |
tree | ed4484baa613372b698cce6fb55a16b0d25ad1d1 | |
parent | 4081f9dc25bf1913b4857d2045c3a55defa069a2 (diff) | |
download | quilt-eeb69930c83314c4ebf659f82cd28241b6b79e7b.tar.gz |
Bump version to 0.61v0.61
-rwxr-xr-x | configure | 2663 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | quilt.changes | 5 |
3 files changed, 1226 insertions, 1444 deletions
@@ -1,21 +1,23 @@ #! /bin/sh # From configure.ac . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for quilt 0.60. +# Generated by GNU Autoconf 2.69 for quilt 0.61. # # Report bugs to <quilt-dev@nongnu.org>. # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -23,23 +25,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -47,7 +41,13 @@ export as_nl 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 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# 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 @@ -58,7 +58,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -81,13 +81,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -97,15 +90,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -117,12 +111,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# 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='> ' @@ -134,330 +132,344 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # 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. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + 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 - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + 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 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +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 +test -x / || 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" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # 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 - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # 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. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +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_echo "$0: Please tell bug-autoconf@gnu.org and +$0: quilt-dev@nongnu.org about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." + fi + exit 1 fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. 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 -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi +## --------------------- ## +## 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 - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi +# 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" -fi -fi +} # as_fn_mkdir_p +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_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 -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# 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 -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + 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/= @@ -474,9 +486,12 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -485,29 +500,18 @@ test \$exitcode = 0") || { exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + 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 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -522,49 +526,29 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi 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 -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 +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -573,11 +557,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 </dev/null 6>&1 +test -n "$DJDIR" || exec 7<&0 </dev/null +exec 6>&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` @@ -592,14 +576,14 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='quilt' PACKAGE_TARNAME='quilt' -PACKAGE_VERSION='0.60' -PACKAGE_STRING='quilt 0.60' +PACKAGE_VERSION='0.61' +PACKAGE_STRING='quilt 0.61' PACKAGE_BUGREPORT='quilt-dev@nongnu.org' +PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS @@ -668,6 +652,7 @@ bindir program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -767,8 +752,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -813,8 +799,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -840,8 +825,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1045,8 +1029,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1062,8 +1045,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1093,17 +1075,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_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 && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + 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 ;; @@ -1112,7 +1094,7 @@ Try \`$0 --help' for more information." >&2 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1120,15 +1102,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1151,8 +1131,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + 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' @@ -1166,8 +1145,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $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 @@ -1182,11 +1159,9 @@ 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_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1225,13 +1200,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + 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_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + 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 @@ -1257,7 +1230,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures quilt 0.60 to adapt to many kinds of systems. +\`configure' configures quilt 0.61 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1271,7 +1244,7 @@ Configuration: --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 @@ -1318,7 +1291,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of quilt 0.60:";; + short | recursive ) echo "Configuration of quilt 0.61:";; esac cat <<\_ACEOF @@ -1423,22 +1396,25 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -quilt configure 0.60 -generated by GNU Autoconf 2.63 +quilt configure 0.61 +generated by GNU Autoconf 2.69 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## 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 quilt $as_me 0.60, which was -generated by GNU Autoconf 2.63. Invocation command line was +It was created by quilt $as_me 0.61, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1474,8 +1450,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1512,9 +1488,9 @@ do 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 @@ -1530,13 +1506,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + 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 @@ -1548,11 +1524,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1561,13 +1535,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_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= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1586,11 +1560,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1603,11 +1575,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1621,11 +1591,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1639,46 +1607,53 @@ _ASBOX exit $exit_status ' 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 -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # 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 @@ -1689,19 +1664,23 @@ fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + 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 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # 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";; @@ -1709,7 +1688,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1724,11 +1703,11 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $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=: ;; ,);; @@ -1738,17 +1717,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${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:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $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:$LINENO: former value: \`$ac_old_val'" >&5 + { $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:$LINENO: current value: \`$ac_new_val'" >&5 + { $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 @@ -1760,43 +1739,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} 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 - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $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:$LINENO: error: changes in the environment can compromise the build" >&5 + { $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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + 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' @@ -1822,9 +1778,7 @@ for ac_dir in config "$srcdir"/config; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1857,10 +1811,10 @@ PACKAGE_RELEASE=1 # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$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 +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -1868,11 +1822,11 @@ 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. @@ -1880,7 +1834,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_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. @@ -1909,7 +1863,7 @@ case $as_dir/ in ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -1925,7 +1879,7 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $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}. @@ -1937,9 +1891,9 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether #! works in shell scripts" >&5 $as_echo_n "checking whether #! works in shell scripts... " >&6; } -if test "${ac_cv_sys_interpreter+set}" = set; then +if ${ac_cv_sys_interpreter+:} false; then : $as_echo_n "(cached) " >&6 else echo '#! /bin/cat @@ -1954,12 +1908,12 @@ else fi rm -f conftest fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_interpreter" >&5 $as_echo "$ac_cv_sys_interpreter" >&6; } interpval=$ac_cv_sys_interpreter if test "$interpval" != yes ; then - { $as_echo "$as_me:$LINENO: WARNING: no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no bash/perl scripts may not be invoked correctly due to problems with your systems implementation of #! being either broken or non-existant. @@ -1978,28 +1932,24 @@ unset BASH # bash sets this itself! # Check whether --with-bash was given. -if test "${with_bash+set}" = set; then +if test "${with_bash+set}" = set; then : withval=$with_bash; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-bash" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-bash" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-bash" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for bash" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bash" >&5 $as_echo_n "checking for bash... " >&6; } BASH="$withval" if test -e "$BASH"; then if test ! -f "$BASH" -a ! -h "$BASH" || test ! -x "$BASH"; then - { { $as_echo "$as_me:$LINENO: error: $BASH is not an executable file" >&5 -$as_echo "$as_me: error: $BASH is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$BASH is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $BASH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 $as_echo "$BASH" >&6; } if test ! -e "$BASH"; then - { $as_echo "$as_me:$LINENO: WARNING: $BASH does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $BASH does not exist" >&5 $as_echo "$as_me: WARNING: $BASH does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS bash" @@ -2010,9 +1960,9 @@ else # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_BASH+set}" = set; then +if ${ac_cv_path_BASH+:} false; then : $as_echo_n "(cached) " >&6 else case $BASH in @@ -2026,14 +1976,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2041,10 +1991,10 @@ esac fi BASH=$ac_cv_path_BASH if test -n "$BASH"; then - { $as_echo "$as_me:$LINENO: result: $BASH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 $as_echo "$BASH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2056,9 +2006,7 @@ fi if test -z "$BASH"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of bash with the option '--with-bash'" >&5 -$as_echo "$as_me: error: Please specify the location of bash with the option '--with-bash'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of bash with the option '--with-bash'" "$LINENO" 5 fi @@ -2072,36 +2020,25 @@ $as_echo "$as_me: error: Please specify the location of bash with the option '-- # don't want to use, or trust it, incase the user is specifying a different # bash executable. if `$BASH -c '[ "$BASH_VERSION" \< "3.0" ]'` ; then - { { $as_echo "$as_me:$LINENO: error: -$PACKAGE_NAME requires at least version 3.0 of bash, you can download a current -version of bash from ftp.gnu.org -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " $PACKAGE_NAME requires at least version 3.0 of bash, you can download a current version of bash from ftp.gnu.org -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $BASH quoting works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $BASH quoting works" >&5 $as_echo_n "checking whether $BASH quoting works... " >&6; } if test `$BASH -c "echo \"\\\$(set -- \\\$'a b'; echo \\\$#)\"" 2>/dev/null` = "1"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: -You have a version of \`bash' which suffers from a quoting bug. -This is a known bug of bash 3.1, which was fixed by patch bash31-011. -You can get this patch at ftp://ftp.gnu.org/gnu/bash/ -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " You have a version of \`bash' which suffers from a quoting bug. This is a known bug of bash 3.1, which was fixed by patch bash31-011. You can get this patch at ftp://ftp.gnu.org/gnu/bash/ -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -2109,28 +2046,24 @@ fi # Check whether --with-cp was given. -if test "${with_cp+set}" = set; then +if test "${with_cp+set}" = set; then : withval=$with_cp; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-cp" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-cp" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-cp" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for cp" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cp" >&5 $as_echo_n "checking for cp... " >&6; } CP="$withval" if test -e "$CP"; then if test ! -f "$CP" -a ! -h "$CP" || test ! -x "$CP"; then - { { $as_echo "$as_me:$LINENO: error: $CP is not an executable file" >&5 -$as_echo "$as_me: error: $CP is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$CP is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $CP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5 $as_echo "$CP" >&6; } if test ! -e "$CP"; then - { $as_echo "$as_me:$LINENO: WARNING: $CP does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CP does not exist" >&5 $as_echo "$as_me: WARNING: $CP does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS cp" @@ -2143,9 +2076,9 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CP+set}" = set; then +if ${ac_cv_path_CP+:} false; then : $as_echo_n "(cached) " >&6 else case $CP in @@ -2159,14 +2092,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2174,10 +2107,10 @@ esac fi CP=$ac_cv_path_CP if test -n "$CP"; then - { $as_echo "$as_me:$LINENO: result: $CP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5 $as_echo "$CP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2195,9 +2128,7 @@ fi if test -z "$CP"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of cp with the option '--with-cp'" >&5 -$as_echo "$as_me: error: Please specify the location of cp with the option '--with-cp'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of cp with the option '--with-cp'" "$LINENO" 5 fi @@ -2207,28 +2138,24 @@ $as_echo "$as_me: error: Please specify the location of cp with the option '--wi # Check whether --with-date was given. -if test "${with_date+set}" = set; then +if test "${with_date+set}" = set; then : withval=$with_date; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-date" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-date" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-date" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for date" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for date" >&5 $as_echo_n "checking for date... " >&6; } DATE="$withval" if test -e "$DATE"; then if test ! -f "$DATE" -a ! -h "$DATE" || test ! -x "$DATE"; then - { { $as_echo "$as_me:$LINENO: error: $DATE is not an executable file" >&5 -$as_echo "$as_me: error: $DATE is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$DATE is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $DATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5 $as_echo "$DATE" >&6; } if test ! -e "$DATE"; then - { $as_echo "$as_me:$LINENO: WARNING: $DATE does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $DATE does not exist" >&5 $as_echo "$as_me: WARNING: $DATE does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS date" @@ -2241,9 +2168,9 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DATE+set}" = set; then +if ${ac_cv_path_DATE+:} false; then : $as_echo_n "(cached) " >&6 else case $DATE in @@ -2257,14 +2184,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2272,10 +2199,10 @@ esac fi DATE=$ac_cv_path_DATE if test -n "$DATE"; then - { $as_echo "$as_me:$LINENO: result: $DATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5 $as_echo "$DATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2293,7 +2220,7 @@ fi if test -z "$DATE"; then - { $as_echo "$as_me:$LINENO: WARNING: Using internal date mechanism. Use option '--with-date' to override" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using internal date mechanism. Use option '--with-date' to override" >&5 $as_echo "$as_me: WARNING: Using internal date mechanism. Use option '--with-date' to override" >&2;} COMPAT_PROGRAMS="$COMPAT_PROGRAMS date" DATE=date @@ -2304,25 +2231,18 @@ $as_echo "$as_me: WARNING: Using internal date mechanism. Use option '--with-da if test -z "$INTERNAL_DATE"; then - { $as_echo "$as_me:$LINENO: checking whether $DATE --rfc-822 works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $DATE --rfc-822 works" >&5 $as_echo_n "checking whether $DATE --rfc-822 works... " >&6; } if $DATE --rfc-822 >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no + as_fn_error $? "no If you don't have a version of \`date' that supports --rfc-822, you can specify '--without-date' and $PACKAGE_NAME will use its own internal date. -" >&5 -$as_echo "$as_me: error: no - -If you don't have a version of \`date' that supports --rfc-822, you -can specify '--without-date' and $PACKAGE_NAME will use its own -internal date. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi fi @@ -2331,28 +2251,24 @@ fi # Check whether --with-perl was given. -if test "${with_perl+set}" = set; then +if test "${with_perl+set}" = set; then : withval=$with_perl; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-perl" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-perl" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-perl" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for perl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl" >&5 $as_echo_n "checking for perl... " >&6; } PERL="$withval" if test -e "$PERL"; then if test ! -f "$PERL" -a ! -h "$PERL" || test ! -x "$PERL"; then - { { $as_echo "$as_me:$LINENO: error: $PERL is not an executable file" >&5 -$as_echo "$as_me: error: $PERL is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$PERL is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } if test ! -e "$PERL"; then - { $as_echo "$as_me:$LINENO: WARNING: $PERL does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PERL does not exist" >&5 $as_echo "$as_me: WARNING: $PERL does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS perl" @@ -2365,9 +2281,9 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -2381,14 +2297,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2396,10 +2312,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2417,9 +2333,7 @@ fi if test -z "$PERL"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of perl with the option '--with-perl'" >&5 -$as_echo "$as_me: error: Please specify the location of perl with the option '--with-perl'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of perl with the option '--with-perl'" "$LINENO" 5 fi @@ -2429,28 +2343,24 @@ $as_echo "$as_me: error: Please specify the location of perl with the option '-- # Check whether --with-grep was given. -if test "${with_grep+set}" = set; then +if test "${with_grep+set}" = set; then : withval=$with_grep; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-grep" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-grep" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-grep" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for grep" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep" >&5 $as_echo_n "checking for grep... " >&6; } GREP="$withval" if test -e "$GREP"; then if test ! -f "$GREP" -a ! -h "$GREP" || test ! -x "$GREP"; then - { { $as_echo "$as_me:$LINENO: error: $GREP is not an executable file" >&5 -$as_echo "$as_me: error: $GREP is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$GREP is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $GREP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5 $as_echo "$GREP" >&6; } if test ! -e "$GREP"; then - { $as_echo "$as_me:$LINENO: WARNING: $GREP does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GREP does not exist" >&5 $as_echo "$as_me: WARNING: $GREP does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS grep" @@ -2461,9 +2371,9 @@ else # Extract the first word of "grep", so it can be a program name with args. set dummy grep; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else case $GREP in @@ -2477,14 +2387,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2492,10 +2402,10 @@ esac fi GREP=$ac_cv_path_GREP if test -n "$GREP"; then - { $as_echo "$as_me:$LINENO: result: $GREP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5 $as_echo "$GREP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2507,56 +2417,41 @@ fi if test -z "$GREP"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of grep with the option '--with-grep'" >&5 -$as_echo "$as_me: error: Please specify the location of grep with the option '--with-grep'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of grep with the option '--with-grep'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $GREP -q works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GREP -q works" >&5 $as_echo_n "checking whether $GREP -q works... " >&6; } if echo first | $GREP -q first 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: -Sorry, you have a version of grep which doesn't understand -q. -$PACKAGE_NAME needs it. If you have access to a version of grep which does -understand -q, you can supply its path with the '--with-grep=' option. -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " Sorry, you have a version of grep which doesn't understand -q. $PACKAGE_NAME needs it. If you have access to a version of grep which does understand -q, you can supply its path with the '--with-grep=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $GREP understands (foo|bar)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GREP understands (foo|bar)" >&5 $as_echo_n "checking whether $GREP understands (foo|bar)... " >&6; } if echo first | $GREP '^\(fir\|las\)' >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: -Sorry, you have a version of grep which doesn't understand constructs -of the form (foo|bar). $PACKAGE_NAME needs it. If you have access to -a version of grep which does understand such constructs, you can supply -its path with the '--with-grep=' option. -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " Sorry, you have a version of grep which doesn't understand constructs of the form (foo|bar). $PACKAGE_NAME needs it. If you have access to a version of grep which does understand such constructs, you can supply its path with the '--with-grep=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -2564,28 +2459,24 @@ fi # Check whether --with-tail was given. -if test "${with_tail+set}" = set; then +if test "${with_tail+set}" = set; then : withval=$with_tail; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-tail" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-tail" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-tail" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for tail" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tail" >&5 $as_echo_n "checking for tail... " >&6; } TAIL="$withval" if test -e "$TAIL"; then if test ! -f "$TAIL" -a ! -h "$TAIL" || test ! -x "$TAIL"; then - { { $as_echo "$as_me:$LINENO: error: $TAIL is not an executable file" >&5 -$as_echo "$as_me: error: $TAIL is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$TAIL is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $TAIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5 $as_echo "$TAIL" >&6; } if test ! -e "$TAIL"; then - { $as_echo "$as_me:$LINENO: WARNING: $TAIL does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TAIL does not exist" >&5 $as_echo "$as_me: WARNING: $TAIL does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS tail" @@ -2596,9 +2487,9 @@ else # Extract the first word of "tail", so it can be a program name with args. set dummy tail; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_TAIL+set}" = set; then +if ${ac_cv_path_TAIL+:} false; then : $as_echo_n "(cached) " >&6 else case $TAIL in @@ -2612,14 +2503,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2627,10 +2518,10 @@ esac fi TAIL=$ac_cv_path_TAIL if test -n "$TAIL"; then - { $as_echo "$as_me:$LINENO: result: $TAIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5 $as_echo "$TAIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2642,36 +2533,27 @@ fi if test -z "$TAIL"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of tail with the option '--with-tail'" >&5 -$as_echo "$as_me: error: Please specify the location of tail with the option '--with-tail'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of tail with the option '--with-tail'" "$LINENO" 5 fi # Solaris' /usr/bin/tail doesn't understand -n. -{ $as_echo "$as_me:$LINENO: checking whether $TAIL -n works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $TAIL -n works" >&5 $as_echo_n "checking whether $TAIL -n works... " >&6; } if test "`(echo first; echo second) | $TAIL -n 1 2>/dev/null`" = "second"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: -Sorry, you have a version of tail which doesn't understand -n. -$PACKAGE_NAME needs it. If you have access to a version of tail which does -understand -n, you can supply its path with the '--with-tail=' option. -Solaris users can use /usr/xpg4/bin/tail. -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " Sorry, you have a version of tail which doesn't understand -n. $PACKAGE_NAME needs it. If you have access to a version of tail which does understand -n, you can supply its path with the '--with-tail=' option. Solaris users can use /usr/xpg4/bin/tail. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -2679,28 +2561,24 @@ fi # Check whether --with-tr was given. -if test "${with_tr+set}" = set; then +if test "${with_tr+set}" = set; then : withval=$with_tr; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-tr" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-tr" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-tr" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for tr" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tr" >&5 $as_echo_n "checking for tr... " >&6; } TR="$withval" if test -e "$TR"; then if test ! -f "$TR" -a ! -h "$TR" || test ! -x "$TR"; then - { { $as_echo "$as_me:$LINENO: error: $TR is not an executable file" >&5 -$as_echo "$as_me: error: $TR is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$TR is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $TR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5 $as_echo "$TR" >&6; } if test ! -e "$TR"; then - { $as_echo "$as_me:$LINENO: WARNING: $TR does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TR does not exist" >&5 $as_echo "$as_me: WARNING: $TR does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS tr" @@ -2711,9 +2589,9 @@ else # Extract the first word of "tr", so it can be a program name with args. set dummy tr; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_TR+set}" = set; then +if ${ac_cv_path_TR+:} false; then : $as_echo_n "(cached) " >&6 else case $TR in @@ -2727,14 +2605,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2742,10 +2620,10 @@ esac fi TR=$ac_cv_path_TR if test -n "$TR"; then - { $as_echo "$as_me:$LINENO: result: $TR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5 $as_echo "$TR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2757,37 +2635,27 @@ fi if test -z "$TR"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of tr with the option '--with-tr'" >&5 -$as_echo "$as_me: error: Please specify the location of tr with the option '--with-tr'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of tr with the option '--with-tr'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $TR understands a-z " >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $TR understands a-z " >&5 $as_echo_n "checking whether $TR understands a-z ... " >&6; } if test "`echo first | $TR a-z A-Z 2>/dev/null`" = "FIRST"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of tr which doesn't understand constructs of the form a-z. $PACKAGE_NAME needs it. If you have access to a version of tr which does understand such constructs, you can supply its path with the '--with-tr=' option. Solaris users can use /usr/xpg4/bin/tr. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of tr which doesn't understand constructs -of the form a-z. $PACKAGE_NAME needs it. If you have access to -a version of tr which does understand such constructs, you can supply -its path with the '--with-tr=' option. -Solaris users can use /usr/xpg4/bin/tr. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -2795,28 +2663,24 @@ fi # Check whether --with-stat was given. -if test "${with_stat+set}" = set; then +if test "${with_stat+set}" = set; then : withval=$with_stat; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-stat" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-stat" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-stat" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for stat" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stat" >&5 $as_echo_n "checking for stat... " >&6; } STAT="$withval" if test -e "$STAT"; then if test ! -f "$STAT" -a ! -h "$STAT" || test ! -x "$STAT"; then - { { $as_echo "$as_me:$LINENO: error: $STAT is not an executable file" >&5 -$as_echo "$as_me: error: $STAT is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$STAT is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $STAT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5 $as_echo "$STAT" >&6; } if test ! -e "$STAT"; then - { $as_echo "$as_me:$LINENO: WARNING: $STAT does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $STAT does not exist" >&5 $as_echo "$as_me: WARNING: $STAT does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS stat" @@ -2827,9 +2691,9 @@ else # Extract the first word of "stat", so it can be a program name with args. set dummy stat; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_STAT+set}" = set; then +if ${ac_cv_path_STAT+:} false; then : $as_echo_n "(cached) " >&6 else case $STAT in @@ -2843,14 +2707,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -2858,10 +2722,10 @@ esac fi STAT=$ac_cv_path_STAT if test -n "$STAT"; then - { $as_echo "$as_me:$LINENO: result: $STAT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5 $as_echo "$STAT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2873,43 +2737,35 @@ fi if test -z "$STAT"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of stat with the option '--with-stat'" >&5 -$as_echo "$as_me: error: Please specify the location of stat with the option '--with-stat'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of stat with the option '--with-stat'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $STAT -c '%h' works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $STAT -c '%h' works" >&5 $as_echo_n "checking whether $STAT -c '%h' works... " >&6; } if $STAT -c '%h' /dev/null >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } STAT_HARDLINK="-c '%h'" else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether $STAT -f '%l' works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $STAT -f '%l' works" >&5 $as_echo_n "checking whether $STAT -f '%l' works... " >&6; } if $STAT -f '%l' /dev/null >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } STAT_HARDLINK="-f '%l'" else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of stat which understands neither -c nor -f. $PACKAGE_NAME needs it. If you have access to a version of stat which does understand -c or -f, you can supply its path with the '--with-stat=' option. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of stat which understands neither -c nor -f. -$PACKAGE_NAME needs it. If you have access to a version of stat which does -understand -c or -f, you can supply its path with the '--with-stat=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi fi @@ -2919,28 +2775,24 @@ fi # Check whether --with-sed was given. -if test "${with_sed+set}" = set; then +if test "${with_sed+set}" = set; then : withval=$with_sed; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-sed" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-sed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-sed" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for sed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sed" >&5 $as_echo_n "checking for sed... " >&6; } SED="$withval" if test -e "$SED"; then if test ! -f "$SED" -a ! -h "$SED" || test ! -x "$SED"; then - { { $as_echo "$as_me:$LINENO: error: $SED is not an executable file" >&5 -$as_echo "$as_me: error: $SED is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SED is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $SED" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 $as_echo "$SED" >&6; } if test ! -e "$SED"; then - { $as_echo "$as_me:$LINENO: WARNING: $SED does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $SED does not exist" >&5 $as_echo "$as_me: WARNING: $SED does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS sed" @@ -2951,9 +2803,9 @@ else # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else case $SED in @@ -2967,14 +2819,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $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 ;; @@ -2982,10 +2834,10 @@ esac fi SED=$ac_cv_path_SED if test -n "$SED"; then - { $as_echo "$as_me:$LINENO: result: $SED" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 $as_echo "$SED" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2997,35 +2849,26 @@ fi if test -z "$SED"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of sed with the option '--with-sed'" >&5 -$as_echo "$as_me: error: Please specify the location of sed with the option '--with-sed'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of sed with the option '--with-sed'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $SED understands (foo|bar)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $SED understands (foo|bar)" >&5 $as_echo_n "checking whether $SED understands (foo|bar)... " >&6; } if test "`echo first | $SED -e 's/\(fir\|lo\)/la/' 2>/dev/null`" = "last"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of sed which doesn't understand constructs of the form (foo|bar). $PACKAGE_NAME needs it. If you have access to a version of sed which does understand such constructs, you can supply its path with the '--with-sed=' option. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of sed which doesn't understand constructs -of the form (foo|bar). $PACKAGE_NAME needs it. If you have access to -a version of sed which does understand such constructs, you can supply -its path with the '--with-sed=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -3033,28 +2876,24 @@ fi # Check whether --with-awk was given. -if test "${with_awk+set}" = set; then +if test "${with_awk+set}" = set; then : withval=$with_awk; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-awk" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-awk" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-awk" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for awk" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for awk" >&5 $as_echo_n "checking for awk... " >&6; } AWK="$withval" if test -e "$AWK"; then if test ! -f "$AWK" -a ! -h "$AWK" || test ! -x "$AWK"; then - { { $as_echo "$as_me:$LINENO: error: $AWK is not an executable file" >&5 -$as_echo "$as_me: error: $AWK is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$AWK is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } if test ! -e "$AWK"; then - { $as_echo "$as_me:$LINENO: WARNING: $AWK does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $AWK does not exist" >&5 $as_echo "$as_me: WARNING: $AWK does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS awk" @@ -3067,9 +2906,9 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_AWK+set}" = set; then +if ${ac_cv_path_AWK+:} false; then : $as_echo_n "(cached) " >&6 else case $AWK in @@ -3083,14 +2922,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3098,10 +2937,10 @@ esac fi AWK=$ac_cv_path_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3119,42 +2958,32 @@ fi if test -z "$AWK"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of awk with the option '--with-awk'" >&5 -$as_echo "$as_me: error: Please specify the location of awk with the option '--with-awk'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of awk with the option '--with-awk'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $AWK supports sub" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AWK supports sub" >&5 $as_echo_n "checking whether $AWK supports sub... " >&6; } if test "`echo first | $AWK 'sub(/first/, "last")' 2>/dev/null`" = "last"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of awk which doesn't understand sub( ). $PACKAGE_NAME needs it. If you have access to a version of awk which does understand such constructs, you can supply its path with the '--with-awk=' option. Solaris users can use /usr/xpg4/bin/awk. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of awk which doesn't understand sub( ). -$PACKAGE_NAME needs it. If you have access to a version of awk -which does understand such constructs, you can supply its path -with the '--with-awk=' option. -Solaris users can use /usr/xpg4/bin/awk. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi # Check whether --with-pod2man was given. -if test "${with_pod2man+set}" = set; then +if test "${with_pod2man+set}" = set; then : withval=$with_pod2man; if test x"$withval" = xno; then POD2MAN= @@ -3165,9 +2994,9 @@ else # Extract the first word of "pod2man", so it can be a program name with args. set dummy pod2man; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2MAN+set}" = set; then +if ${ac_cv_path_POD2MAN+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2MAN in @@ -3180,14 +3009,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3195,10 +3024,10 @@ esac fi POD2MAN=$ac_cv_path_POD2MAN if test -n "$POD2MAN"; then - { $as_echo "$as_me:$LINENO: result: $POD2MAN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2MAN" >&5 $as_echo "$POD2MAN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3214,28 +3043,24 @@ fi # Check whether --with-column was given. -if test "${with_column+set}" = set; then +if test "${with_column+set}" = set; then : withval=$with_column; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-column" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-column" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-column" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for column" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for column" >&5 $as_echo_n "checking for column... " >&6; } COLUMN="$withval" if test -e "$COLUMN"; then if test ! -f "$COLUMN" -a ! -h "$COLUMN" || test ! -x "$COLUMN"; then - { { $as_echo "$as_me:$LINENO: error: $COLUMN is not an executable file" >&5 -$as_echo "$as_me: error: $COLUMN is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$COLUMN is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $COLUMN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COLUMN" >&5 $as_echo "$COLUMN" >&6; } if test ! -e "$COLUMN"; then - { $as_echo "$as_me:$LINENO: WARNING: $COLUMN does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $COLUMN does not exist" >&5 $as_echo "$as_me: WARNING: $COLUMN does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS column" @@ -3246,9 +3071,9 @@ else # Extract the first word of "column", so it can be a program name with args. set dummy column; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_COLUMN+set}" = set; then +if ${ac_cv_path_COLUMN+:} false; then : $as_echo_n "(cached) " >&6 else case $COLUMN in @@ -3262,14 +3087,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_COLUMN="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3277,10 +3102,10 @@ esac fi COLUMN=$ac_cv_path_COLUMN if test -n "$COLUMN"; then - { $as_echo "$as_me:$LINENO: result: $COLUMN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COLUMN" >&5 $as_echo "$COLUMN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3292,7 +3117,7 @@ fi if test -z "$COLUMN"; then - { $as_echo "$as_me:$LINENO: WARNING: Using internal column mechanism. Use option '--with-column' to override" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using internal column mechanism. Use option '--with-column' to override" >&5 $as_echo "$as_me: WARNING: Using internal column mechanism. Use option '--with-column' to override" >&2;} COMPAT_PROGRAMS="$COMPAT_PROGRAMS column" COLUMN=column @@ -3306,28 +3131,24 @@ $as_echo "$as_me: WARNING: Using internal column mechanism. Use option '--with- # Check whether --with-getopt was given. -if test "${with_getopt+set}" = set; then +if test "${with_getopt+set}" = set; then : withval=$with_getopt; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-getopt" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-getopt" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-getopt" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for getopt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt" >&5 $as_echo_n "checking for getopt... " >&6; } GETOPT="$withval" if test -e "$GETOPT"; then if test ! -f "$GETOPT" -a ! -h "$GETOPT" || test ! -x "$GETOPT"; then - { { $as_echo "$as_me:$LINENO: error: $GETOPT is not an executable file" >&5 -$as_echo "$as_me: error: $GETOPT is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$GETOPT is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $GETOPT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETOPT" >&5 $as_echo "$GETOPT" >&6; } if test ! -e "$GETOPT"; then - { $as_echo "$as_me:$LINENO: WARNING: $GETOPT does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GETOPT does not exist" >&5 $as_echo "$as_me: WARNING: $GETOPT does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS getopt" @@ -3338,9 +3159,9 @@ else # Extract the first word of "getopt", so it can be a program name with args. set dummy getopt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GETOPT+set}" = set; then +if ${ac_cv_path_GETOPT+:} false; then : $as_echo_n "(cached) " >&6 else case $GETOPT in @@ -3354,14 +3175,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GETOPT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3369,10 +3190,10 @@ esac fi GETOPT=$ac_cv_path_GETOPT if test -n "$GETOPT"; then - { $as_echo "$as_me:$LINENO: result: $GETOPT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETOPT" >&5 $as_echo "$GETOPT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3384,7 +3205,7 @@ fi if test -z "$GETOPT"; then - { $as_echo "$as_me:$LINENO: WARNING: Using internal getopt mechanism. Use option '--with-getopt' to override" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using internal getopt mechanism. Use option '--with-getopt' to override" >&5 $as_echo "$as_me: WARNING: Using internal getopt mechanism. Use option '--with-getopt' to override" >&2;} COMPAT_PROGRAMS="$COMPAT_PROGRAMS getopt" GETOPT=getopt @@ -3395,31 +3216,24 @@ $as_echo "$as_me: WARNING: Using internal getopt mechanism. Use option '--with- if test -z "$INTERNAL_GETOPT"; then - { $as_echo "$as_me:$LINENO: checking for getopt --long syntax" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt --long syntax" >&5 $as_echo_n "checking for getopt --long syntax... " >&6; } $GETOPT -o t --long test -- --test | grep 'illegal option' >/dev/null getopt_long_errors=$? $GETOPT -o t --long test -- --test | grep '^ *--test *--' >/dev/null getopt_long_works=$? if test $getopt_long_errors -eq 1 -a $getopt_long_works -eq 0; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " $GETOPT does not support the --long option. If you don't have a version of getopt that supports long options, you can specify '--without-getopt' and $PACKAGE_NAME will use its own internal getopt. -" >&5 -$as_echo "$as_me: error: -$GETOPT does not support the --long option. -If you don't have a version of getopt that supports long options, you -can specify '--without-getopt' and $PACKAGE_NAME will use its own -internal getopt. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi fi @@ -3428,28 +3242,24 @@ fi # Check whether --with-mktemp was given. -if test "${with_mktemp+set}" = set; then +if test "${with_mktemp+set}" = set; then : withval=$with_mktemp; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-mktemp" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-mktemp" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-mktemp" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for mktemp" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mktemp" >&5 $as_echo_n "checking for mktemp... " >&6; } MKTEMP="$withval" if test -e "$MKTEMP"; then if test ! -f "$MKTEMP" -a ! -h "$MKTEMP" || test ! -x "$MKTEMP"; then - { { $as_echo "$as_me:$LINENO: error: $MKTEMP is not an executable file" >&5 -$as_echo "$as_me: error: $MKTEMP is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$MKTEMP is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $MKTEMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5 $as_echo "$MKTEMP" >&6; } if test ! -e "$MKTEMP"; then - { $as_echo "$as_me:$LINENO: WARNING: $MKTEMP does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $MKTEMP does not exist" >&5 $as_echo "$as_me: WARNING: $MKTEMP does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS mktemp" @@ -3460,9 +3270,9 @@ else # Extract the first word of "mktemp", so it can be a program name with args. set dummy mktemp; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MKTEMP+set}" = set; then +if ${ac_cv_path_MKTEMP+:} false; then : $as_echo_n "(cached) " >&6 else case $MKTEMP in @@ -3476,14 +3286,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3491,10 +3301,10 @@ esac fi MKTEMP=$ac_cv_path_MKTEMP if test -n "$MKTEMP"; then - { $as_echo "$as_me:$LINENO: result: $MKTEMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5 $as_echo "$MKTEMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3506,7 +3316,7 @@ fi if test -z "$MKTEMP"; then - { $as_echo "$as_me:$LINENO: WARNING: Using internal mktemp mechanism. Use option '--with-mktemp' to override" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using internal mktemp mechanism. Use option '--with-mktemp' to override" >&5 $as_echo "$as_me: WARNING: Using internal mktemp mechanism. Use option '--with-mktemp' to override" >&2;} COMPAT_PROGRAMS="$COMPAT_PROGRAMS mktemp" MKTEMP=mktemp @@ -3516,28 +3326,21 @@ $as_echo "$as_me: WARNING: Using internal mktemp mechanism. Use option '--with- if test -z "$INTERNAL_MKTEMP" ; then - { $as_echo "$as_me:$LINENO: checking whether $MKTEMP -d works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $MKTEMP -d works" >&5 $as_echo_n "checking whether $MKTEMP -d works... " >&6; } if tempdir=`$MKTEMP -d ${TMPDIR:-/tmp}/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ rmdir "$tempdir" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " '$MKTEMP -d' does not create temporary directories. If you don't have a version of mktemp that can create directories, you can specify '--without-mktemp' and $PACKAGE_NAME will use its own internal tempfile generation mechanism. -" >&5 -$as_echo "$as_me: error: -'$MKTEMP -d' does not create temporary directories. -If you don't have a version of mktemp that can create directories, you -can specify '--without-mktemp' and $PACKAGE_NAME will use its own -internal tempfile generation mechanism. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi fi @@ -3546,28 +3349,24 @@ fi # Check whether --with-diff was given. -if test "${with_diff+set}" = set; then +if test "${with_diff+set}" = set; then : withval=$with_diff; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-diff" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-diff" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-diff" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for diff" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for diff" >&5 $as_echo_n "checking for diff... " >&6; } DIFF="$withval" if test -e "$DIFF"; then if test ! -f "$DIFF" -a ! -h "$DIFF" || test ! -x "$DIFF"; then - { { $as_echo "$as_me:$LINENO: error: $DIFF is not an executable file" >&5 -$as_echo "$as_me: error: $DIFF is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$DIFF is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $DIFF" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5 $as_echo "$DIFF" >&6; } if test ! -e "$DIFF"; then - { $as_echo "$as_me:$LINENO: WARNING: $DIFF does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $DIFF does not exist" >&5 $as_echo "$as_me: WARNING: $DIFF does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS diff" @@ -3578,9 +3377,9 @@ else # Extract the first word of "diff", so it can be a program name with args. set dummy diff; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DIFF+set}" = set; then +if ${ac_cv_path_DIFF+:} false; then : $as_echo_n "(cached) " >&6 else case $DIFF in @@ -3594,14 +3393,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3609,10 +3408,10 @@ esac fi DIFF=$ac_cv_path_DIFF if test -n "$DIFF"; then - { $as_echo "$as_me:$LINENO: result: $DIFF" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5 $as_echo "$DIFF" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3624,9 +3423,7 @@ fi if test -z "$DIFF"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of diff with the option '--with-diff'" >&5 -$as_echo "$as_me: error: Please specify the location of diff with the option '--with-diff'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of diff with the option '--with-diff'" "$LINENO" 5 fi @@ -3636,28 +3433,24 @@ $as_echo "$as_me: error: Please specify the location of diff with the option '-- # Check whether --with-patch was given. -if test "${with_patch+set}" = set; then +if test "${with_patch+set}" = set; then : withval=$with_patch; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-patch" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-patch" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-patch" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for patch" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch" >&5 $as_echo_n "checking for patch... " >&6; } PATCH="$withval" if test -e "$PATCH"; then if test ! -f "$PATCH" -a ! -h "$PATCH" || test ! -x "$PATCH"; then - { { $as_echo "$as_me:$LINENO: error: $PATCH is not an executable file" >&5 -$as_echo "$as_me: error: $PATCH is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$PATCH is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $PATCH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 $as_echo "$PATCH" >&6; } if test ! -e "$PATCH"; then - { $as_echo "$as_me:$LINENO: WARNING: $PATCH does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PATCH does not exist" >&5 $as_echo "$as_me: WARNING: $PATCH does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS patch" @@ -3668,9 +3461,9 @@ else # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PATCH+set}" = set; then +if ${ac_cv_path_PATCH+:} false; then : $as_echo_n "(cached) " >&6 else case $PATCH in @@ -3684,14 +3477,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3699,10 +3492,10 @@ esac fi PATCH=$ac_cv_path_PATCH if test -n "$PATCH"; then - { $as_echo "$as_me:$LINENO: result: $PATCH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 $as_echo "$PATCH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3714,21 +3507,19 @@ fi if test -z "$PATCH"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of patch with the option '--with-patch'" >&5 -$as_echo "$as_me: error: Please specify the location of patch with the option '--with-patch'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of patch with the option '--with-patch'" "$LINENO" 5 fi # Sun diff and others will not work because GNU patch options are used. -{ $as_echo "$as_me:$LINENO: checking the version of $DIFF" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the version of $DIFF" >&5 $as_echo_n "checking the version of $DIFF... " >&6; } if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'` diff_version=$1 - { $as_echo "$as_me:$LINENO: result: $diff_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $diff_version" >&5 $as_echo "$diff_version" >&6; } saved_IFS=$IFS; IFS='.' set -- $diff_version @@ -3738,26 +3529,20 @@ $as_echo "$diff_version" >&6; } diff_version= fi else - { $as_echo "$as_me:$LINENO: result: no GNU diff" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GNU diff" >&5 $as_echo "no GNU diff" >&6; } fi if test -z "$diff_version" ; then - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " $PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can download a current version of patch from ftp.gnu.org, or if you already have GNU diff then you can supply its path with the '--with-diff=' option. -" >&5 -$as_echo "$as_me: error: -$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can -download a current version of patch from ftp.gnu.org, or if you already -have GNU diff then you can supply its path with the '--with-diff=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi # Sun's patch, and others, do not work because GNU patch options are used. -{ $as_echo "$as_me:$LINENO: checking the version of $PATCH" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the version of $PATCH" >&5 $as_echo_n "checking the version of $PATCH... " >&6; } if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then set -- `$PATCH --version 2> /dev/null` @@ -3766,7 +3551,7 @@ if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then else patch_version=$2 fi - { $as_echo "$as_me:$LINENO: result: $patch_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $patch_version" >&5 $as_echo "$patch_version" >&6; } saved_IFS=$IFS; IFS='.' set -- $patch_version @@ -3776,21 +3561,15 @@ $as_echo "$patch_version" >&6; } patch_version= fi else - { $as_echo "$as_me:$LINENO: result: no GNU patch" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GNU patch" >&5 $as_echo "no GNU patch" >&6; } fi if test -z "$patch_version" ; then - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " $PACKAGE_NAME requires at least version 2.5 of GNU patch. You can download a current version of patch from ftp.gnu.org, or if you already have GNU patch then you can supply its path with the '--with-patch=' option. -" >&5 -$as_echo "$as_me: error: -$PACKAGE_NAME requires at least version 2.5 of GNU patch. You can download a -current version of patch from ftp.gnu.org, or if you already have GNU patch -then you can supply its path with the '--with-patch=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -3798,28 +3577,24 @@ fi # Check whether --with-find was given. -if test "${with_find+set}" = set; then +if test "${with_find+set}" = set; then : withval=$with_find; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-find" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-find" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-find" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for find" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for find" >&5 $as_echo_n "checking for find... " >&6; } FIND="$withval" if test -e "$FIND"; then if test ! -f "$FIND" -a ! -h "$FIND" || test ! -x "$FIND"; then - { { $as_echo "$as_me:$LINENO: error: $FIND is not an executable file" >&5 -$as_echo "$as_me: error: $FIND is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$FIND is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $FIND" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5 $as_echo "$FIND" >&6; } if test ! -e "$FIND"; then - { $as_echo "$as_me:$LINENO: WARNING: $FIND does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $FIND does not exist" >&5 $as_echo "$as_me: WARNING: $FIND does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS find" @@ -3830,9 +3605,9 @@ else # Extract the first word of "find", so it can be a program name with args. set dummy find; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FIND+set}" = set; then +if ${ac_cv_path_FIND+:} false; then : $as_echo_n "(cached) " >&6 else case $FIND in @@ -3846,14 +3621,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3861,10 +3636,10 @@ esac fi FIND=$ac_cv_path_FIND if test -n "$FIND"; then - { $as_echo "$as_me:$LINENO: result: $FIND" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5 $as_echo "$FIND" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3876,58 +3651,42 @@ fi if test -z "$FIND"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of find with the option '--with-find'" >&5 -$as_echo "$as_me: error: Please specify the location of find with the option '--with-find'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of find with the option '--with-find'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $FIND -path works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FIND -path works" >&5 $as_echo_n "checking whether $FIND -path works... " >&6; } if $FIND . -path '*' >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of find which doesn't understand -path. $PACKAGE_NAME needs it. If you have access to a version of find which does understand -path, you can supply its path with the '--with-find=' option. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of find which doesn't understand -path. -$PACKAGE_NAME needs it. If you have access to a version of find which -does understand -path, you can supply its path with the -'--with-find=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $FIND -print0 works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FIND -print0 works" >&5 $as_echo_n "checking whether $FIND -print0 works... " >&6; } if $FIND . -path '*' -print0 >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: -Sorry, you have a version of find which doesn't understand -print0. -$PACKAGE_NAME needs it. If you have access to a version of find which -does understand -print0, you can supply its path with the -'--with-find=' option. -" >&5 -$as_echo "$as_me: error: + as_fn_error $? " Sorry, you have a version of find which doesn't understand -print0. $PACKAGE_NAME needs it. If you have access to a version of find which does understand -print0, you can supply its path with the '--with-find=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi @@ -3935,28 +3694,24 @@ fi # Check whether --with-xargs was given. -if test "${with_xargs+set}" = set; then +if test "${with_xargs+set}" = set; then : withval=$with_xargs; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-xargs" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-xargs" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-xargs" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for xargs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xargs" >&5 $as_echo_n "checking for xargs... " >&6; } XARGS="$withval" if test -e "$XARGS"; then if test ! -f "$XARGS" -a ! -h "$XARGS" || test ! -x "$XARGS"; then - { { $as_echo "$as_me:$LINENO: error: $XARGS is not an executable file" >&5 -$as_echo "$as_me: error: $XARGS is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$XARGS is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $XARGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XARGS" >&5 $as_echo "$XARGS" >&6; } if test ! -e "$XARGS"; then - { $as_echo "$as_me:$LINENO: WARNING: $XARGS does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $XARGS does not exist" >&5 $as_echo "$as_me: WARNING: $XARGS does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS xargs" @@ -3967,9 +3722,9 @@ else # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XARGS+set}" = set; then +if ${ac_cv_path_XARGS+:} false; then : $as_echo_n "(cached) " >&6 else case $XARGS in @@ -3983,14 +3738,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -3998,10 +3753,10 @@ esac fi XARGS=$ac_cv_path_XARGS if test -n "$XARGS"; then - { $as_echo "$as_me:$LINENO: result: $XARGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XARGS" >&5 $as_echo "$XARGS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4013,57 +3768,46 @@ fi if test -z "$XARGS"; then - { { $as_echo "$as_me:$LINENO: error: Please specify the location of xargs with the option '--with-xargs'" >&5 -$as_echo "$as_me: error: Please specify the location of xargs with the option '--with-xargs'" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Please specify the location of xargs with the option '--with-xargs'" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking whether $XARGS -0 works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $XARGS -0 works" >&5 $as_echo_n "checking whether $XARGS -0 works... " >&6; } if echo | $XARGS -0 echo >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " Sorry, you have a version of xargs which doesn't understand -0. $PACKAGE_NAME needs it. If you have access to a version of xargs which does understand -0, you can supply its path with the '--with-xargs=' option. -" >&5 -$as_echo "$as_me: error: -Sorry, you have a version of xargs which doesn't understand -0. -$PACKAGE_NAME needs it. If you have access to a version of xargs which -does understand -0, you can supply its path with the -'--with-xargs=' option. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi # Check whether --with-diffstat was given. -if test "${with_diffstat+set}" = set; then +if test "${with_diffstat+set}" = set; then : withval=$with_diffstat; if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for diffstat" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for diffstat" >&5 $as_echo_n "checking for diffstat... " >&6; } DIFFSTAT="$withval" if test -e "$DIFFSTAT"; then if test ! -f "$DIFFSTAT" -a ! -h "$DIFFSTAT" || test ! -x "$DIFFSTAT"; then - { { $as_echo "$as_me:$LINENO: error: $DIFFSTAT is not an executable file" >&5 -$as_echo "$as_me: error: $DIFFSTAT is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$DIFFSTAT is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $DIFFSTAT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFFSTAT" >&5 $as_echo "$DIFFSTAT" >&6; } if test ! -e "$DIFFSTAT"; then - { $as_echo "$as_me:$LINENO: WARNING: $DIFFSTAT does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $DIFFSTAT does not exist" >&5 $as_echo "$as_me: WARNING: $DIFFSTAT does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS diffstat" @@ -4074,9 +3818,9 @@ else # Extract the first word of "diffstat", so it can be a program name with args. set dummy diffstat; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DIFFSTAT+set}" = set; then +if ${ac_cv_path_DIFFSTAT+:} false; then : $as_echo_n "(cached) " >&6 else case $DIFFSTAT in @@ -4090,14 +3834,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DIFFSTAT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4105,10 +3849,10 @@ esac fi DIFFSTAT=$ac_cv_path_DIFFSTAT if test -n "$DIFFSTAT"; then - { $as_echo "$as_me:$LINENO: result: $DIFFSTAT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFFSTAT" >&5 $as_echo "$DIFFSTAT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4116,7 +3860,7 @@ fi if test -z "$DIFFSTAT"; then - { $as_echo "$as_me:$LINENO: WARNING: diffstat not found, some optional functionalities will be missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: diffstat not found, some optional functionalities will be missing" >&5 $as_echo "$as_me: WARNING: diffstat not found, some optional functionalities will be missing" >&2;} fi @@ -4133,7 +3877,7 @@ if test "$DIFFSTAT" != "diffstat"; then # will show progress data we don't want to see. This is only a warning # and we continue even if version is older, as this is only a minor # annoyance. - { $as_echo "$as_me:$LINENO: checking for diffstat version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for diffstat version" >&5 $as_echo_n "checking for diffstat version... " >&6; } diffstat_version=`$DIFFSTAT -V 2>/dev/null | \ sed 's/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1 \2/'` @@ -4141,9 +3885,9 @@ $as_echo_n "checking for diffstat version... " >&6; } diffstat_major_version="$1" diffstat_minor_version="$2" if test -z "$diffstat_major_version" -o -z "$diffstat_minor_version"; then - { $as_echo "$as_me:$LINENO: result: unknown" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 $as_echo "unknown" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: diffstat utility version couldn't be checked; chances are good that the --diffstat option of the refresh command will not work properly. " >&5 @@ -4152,11 +3896,11 @@ diffstat utility version couldn't be checked; chances are good that the --diffstat option of the refresh command will not work properly. " >&2;} else - { $as_echo "$as_me:$LINENO: result: $diffstat_major_version.$diffstat_minor_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $diffstat_major_version.$diffstat_minor_version" >&5 $as_echo "$diffstat_major_version.$diffstat_minor_version" >&6; } if test "$diffstat_major_version" -lt 1 \ -o \( "$diffstat_major_version" -eq 1 -a "$diffstat_minor_version" -lt 32 \); then - { $as_echo "$as_me:$LINENO: WARNING: + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: diffstat utility is too old; the --diffstat option of the refresh command will not work correctly until a newer version (>= 1.32) is installed. " >&5 @@ -4173,28 +3917,24 @@ fi # Check whether --with-sendmail was given. -if test "${with_sendmail+set}" = set; then +if test "${with_sendmail+set}" = set; then : withval=$with_sendmail; if test x"$withval" = xnone; then - { { $as_echo "$as_me:$LINENO: error: Invalid configure argument. use --without-sendmail" >&5 -$as_echo "$as_me: error: Invalid configure argument. use --without-sendmail" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Invalid configure argument. use --without-sendmail" "$LINENO" 5 fi if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for sendmail" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendmail" >&5 $as_echo_n "checking for sendmail... " >&6; } SENDMAIL="$withval" if test -e "$SENDMAIL"; then if test ! -f "$SENDMAIL" -a ! -h "$SENDMAIL" || test ! -x "$SENDMAIL"; then - { { $as_echo "$as_me:$LINENO: error: $SENDMAIL is not an executable file" >&5 -$as_echo "$as_me: error: $SENDMAIL is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SENDMAIL is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $SENDMAIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SENDMAIL" >&5 $as_echo "$SENDMAIL" >&6; } if test ! -e "$SENDMAIL"; then - { $as_echo "$as_me:$LINENO: WARNING: $SENDMAIL does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $SENDMAIL does not exist" >&5 $as_echo "$as_me: WARNING: $SENDMAIL does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS sendmail" @@ -4205,9 +3945,9 @@ else # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SENDMAIL+set}" = set; then +if ${ac_cv_path_SENDMAIL+:} false; then : $as_echo_n "(cached) " >&6 else case $SENDMAIL in @@ -4221,14 +3961,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4236,10 +3976,10 @@ esac fi SENDMAIL=$ac_cv_path_SENDMAIL if test -n "$SENDMAIL"; then - { $as_echo "$as_me:$LINENO: result: $SENDMAIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SENDMAIL" >&5 $as_echo "$SENDMAIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4262,7 +4002,7 @@ fi if test -z "$SENDMAIL"; then - { $as_echo "$as_me:$LINENO: WARNING: Using internal sendmail mechanism. Use option '--with-sendmail' to override" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using internal sendmail mechanism. Use option '--with-sendmail' to override" >&5 $as_echo "$as_me: WARNING: Using internal sendmail mechanism. Use option '--with-sendmail' to override" >&2;} COMPAT_PROGRAMS="$COMPAT_PROGRAMS sendmail" SENDMAIL=sendmail @@ -4274,9 +4014,9 @@ $as_echo "$as_me: WARNING: Using internal sendmail mechanism. Use option '--wit # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -4289,14 +4029,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4304,19 +4044,19 @@ esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -4329,14 +4069,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4344,19 +4084,19 @@ esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -4369,14 +4109,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4384,19 +4124,19 @@ esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msguniq", so it can be a program name with args. set dummy msguniq; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGUNIQ+set}" = set; then +if ${ac_cv_path_MSGUNIQ+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGUNIQ in @@ -4409,14 +4149,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGUNIQ="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4424,19 +4164,19 @@ esac fi MSGUNIQ=$ac_cv_path_MSGUNIQ if test -n "$MSGUNIQ"; then - { $as_echo "$as_me:$LINENO: result: $MSGUNIQ" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGUNIQ" >&5 $as_echo "$MSGUNIQ" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgcat", so it can be a program name with args. set dummy msgcat; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGCAT+set}" = set; then +if ${ac_cv_path_MSGCAT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGCAT in @@ -4449,14 +4189,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGCAT="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4464,10 +4204,10 @@ esac fi MSGCAT=$ac_cv_path_MSGCAT if test -n "$MSGCAT"; then - { $as_echo "$as_me:$LINENO: result: $MSGCAT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGCAT" >&5 $as_echo "$MSGCAT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4480,7 +4220,7 @@ fi USE_NLS=no # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=$HAVE_NLS @@ -4488,22 +4228,16 @@ fi if test $USE_NLS = yes -a $HAVE_NLS = no ; then - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " You do not appear to have msgfmt, which is part of the GNU Gettext package. It is a required package as you chose the '--enable-nls' option to configure. You can download GNU Gettext from ftp.gnu.org -" >&5 -$as_echo "$as_me: error: -You do not appear to have msgfmt, which is part of the GNU Gettext package. It -is a required package as you chose the '--enable-nls' option to configure. -You can download GNU Gettext from ftp.gnu.org -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 fi # Check whether --with-patch-wrapper was given. -if test "${with_patch_wrapper+set}" = set; then +if test "${with_patch_wrapper+set}" = set; then : withval=$with_patch_wrapper; fi @@ -4511,7 +4245,7 @@ PATCH_WRAPPER=$withval if test $USE_NLS = no ; then - { $as_echo "$as_me:$LINENO: Building without natural language support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Building without natural language support" >&5 $as_echo "$as_me: Building without natural language support" >&6;} fi @@ -4521,23 +4255,21 @@ fi # Check whether --with-rpmbuild was given. -if test "${with_rpmbuild+set}" = set; then +if test "${with_rpmbuild+set}" = set; then : withval=$with_rpmbuild; if test x"$withval" != xno; then - { $as_echo "$as_me:$LINENO: checking for rpmbuild" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmbuild" >&5 $as_echo_n "checking for rpmbuild... " >&6; } RPMBUILD="$withval" if test -e "$RPMBUILD"; then if test ! -f "$RPMBUILD" -a ! -h "$RPMBUILD" || test ! -x "$RPMBUILD"; then - { { $as_echo "$as_me:$LINENO: error: $RPMBUILD is not an executable file" >&5 -$as_echo "$as_me: error: $RPMBUILD is not an executable file" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$RPMBUILD is not an executable file" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $RPMBUILD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5 $as_echo "$RPMBUILD" >&6; } if test ! -e "$RPMBUILD"; then - { $as_echo "$as_me:$LINENO: WARNING: $RPMBUILD does not exist" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $RPMBUILD does not exist" >&5 $as_echo "$as_me: WARNING: $RPMBUILD does not exist" >&2;} fi COMPAT_SYMLINKS="$COMPAT_SYMLINKS rpmbuild" @@ -4550,9 +4282,9 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RPMBUILD+set}" = set; then +if ${ac_cv_path_RPMBUILD+:} false; then : $as_echo_n "(cached) " >&6 else case $RPMBUILD in @@ -4566,14 +4298,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext" - $as_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 ;; @@ -4581,10 +4313,10 @@ esac fi RPMBUILD=$ac_cv_path_RPMBUILD if test -n "$RPMBUILD"; then - { $as_echo "$as_me:$LINENO: result: $RPMBUILD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5 $as_echo "$RPMBUILD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4598,7 +4330,7 @@ done if test -z "$RPMBUILD"; then - { $as_echo "$as_me:$LINENO: WARNING: rpmbuild not found, some optional functionalities will be missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rpmbuild not found, some optional functionalities will be missing" >&5 $as_echo "$as_me: WARNING: rpmbuild not found, some optional functionalities will be missing" >&2;} fi @@ -4642,13 +4374,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_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= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -4656,8 +4388,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -4679,12 +4411,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&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:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $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 + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $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 @@ -4734,14 +4477,15 @@ DEFS=`sed -n "$ac_script" confdefs.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_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. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + 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 @@ -4749,13 +4493,14 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +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. @@ -4765,17 +4510,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -4783,23 +4529,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -4807,7 +4545,13 @@ export as_nl 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 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# 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 @@ -4818,7 +4562,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -4841,13 +4585,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -4857,15 +4594,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -4877,12 +4615,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# 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='> ' @@ -4894,7 +4636,89 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# 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 + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -4908,8 +4732,12 @@ 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_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -4929,76 +4757,25 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + 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 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -5013,49 +4790,85 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi 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 -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 + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -5065,13 +4878,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, 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. ac_log=" -This file was extended by quilt $as_me 0.60, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by quilt $as_me 0.61, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5098,13 +4917,15 @@ _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 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -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 @@ -5115,16 +4936,17 @@ Usage: $0 [OPTION]... [FILE]... Configuration files: $config_files -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to <quilt-dev@nongnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -quilt config.status 0.60 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +quilt config.status 0.61 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5140,11 +4962,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) 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 @@ -5158,14 +4985,17 @@ do ac_cs_recheck=: ;; --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 case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -5174,11 +5004,10 @@ do ac_cs_silent=: ;; # This is an error. - -*) { $as_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 @@ -5195,7 +5024,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$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' @@ -5226,9 +5055,7 @@ do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -5249,26 +5076,24 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5276,7 +5101,13 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr='
' +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 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -5284,7 +5115,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -5293,24 +5124,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5318,7 +5143,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -5332,7 +5157,7 @@ s/'"$ac_delim"'$// t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -5346,7 +5171,7 @@ s/.\{148\}// t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -5366,7 +5191,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -5398,23 +5223,29 @@ 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_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# 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[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + 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 @@ -5432,9 +5263,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -5453,7 +5282,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_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 `:'. @@ -5462,12 +5291,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + 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 - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -5478,7 +5305,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $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. @@ -5490,10 +5317,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5521,47 +5346,7 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -5613,7 +5398,6 @@ 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 @@ -5623,12 +5407,11 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $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 @@ -5638,7 +5421,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -5665,27 +5448,24 @@ 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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_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:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_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;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -5695,15 +5475,12 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} done # for ac_tag -{ (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_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -5724,24 +5501,24 @@ if test "$no_create" != yes; then 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:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $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 -{ $as_echo "$as_me:$LINENO: result: " >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: $PACKAGE_NAME version $PACKAGE_VERSION configured." >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_NAME version $PACKAGE_VERSION configured." >&5 $as_echo "$PACKAGE_NAME version $PACKAGE_VERSION configured." >&6; } -{ $as_echo "$as_me:$LINENO: result: " >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: Using '$prefix' for installation prefix." >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using '$prefix' for installation prefix." >&5 $as_echo "Using '$prefix' for installation prefix." >&6; } -{ $as_echo "$as_me:$LINENO: result: " >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: Report bugs to $PACKAGE_BUGREPORT" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Report bugs to $PACKAGE_BUGREPORT" >&5 $as_echo "Report bugs to $PACKAGE_BUGREPORT" >&6; } diff --git a/configure.ac b/configure.ac index 469e6d7..b181dcf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([quilt],[0.60],[quilt-dev@nongnu.org]) +AC_INIT([quilt],[0.61],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) AC_REVISION ($Revision: 1.84 $) diff --git a/quilt.changes b/quilt.changes index a33c6ca..b917875 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Dec 8 21:50:33 CET 2013 - mquinson@debian.org + +- configure*: Bump version to 0.61 "better releasing quilt than working" + +------------------------------------------------------------------- Sun Dec 8 10:46:10 CET 2013 - mquinson@debian.org - quilt/mail.in: accept recipents that have no full name along with |