masqmail-0.2
changeset 187:9c3765e1171b 0.2.30
changed to release version number and updated to newer autoconf
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Sat, 27 Aug 2011 18:20:14 +0200 |
| parents | 4714f093fc77 |
| children | 407874c88cf0 |
| files | aclocal.m4 configure configure.ac |
| diffstat | 3 files changed, 304 insertions(+), 264 deletions(-) [+] |
line diff
1.1 --- a/aclocal.m4 Sat Aug 27 18:16:18 2011 +0200 1.2 +++ b/aclocal.m4 Sat Aug 27 18:20:14 2011 +0200 1.3 @@ -13,8 +13,8 @@ 1.4 1.5 m4_ifndef([AC_AUTOCONF_VERSION], 1.6 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 1.7 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, 1.8 -[m4_warning([this file was generated for autoconf 2.65. 1.9 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, 1.10 +[m4_warning([this file was generated for autoconf 2.68. 1.11 You have another version of autoconf. It may work, but is not guaranteed to. 1.12 If you have problems, you may need to regenerate the build system entirely. 1.13 To do so, use the procedure documented by the package, typically `autoreconf'.])]) 1.14 @@ -156,7 +156,7 @@ 1.15 Consider adjusting the PKG_CONFIG_PATH environment variable if you 1.16 installed software in a non-standard prefix. 1.17 1.18 -_PKG_TEXT])dnl 1.19 +_PKG_TEXT])[]dnl 1.20 ]) 1.21 elif test $pkg_failed = untried; then 1.22 AC_MSG_RESULT([no]) 1.23 @@ -167,7 +167,7 @@ 1.24 1.25 _PKG_TEXT 1.26 1.27 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl 1.28 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl 1.29 ]) 1.30 else 1.31 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
2.1 --- a/configure Sat Aug 27 18:16:18 2011 +0200 2.2 +++ b/configure Sat Aug 27 18:20:14 2011 +0200 2.3 @@ -1,13 +1,13 @@ 2.4 #! /bin/sh 2.5 # Guess values for system-dependent variables and create Makefiles. 2.6 -# Generated by GNU Autoconf 2.65 for masqmail 0.2.30-dev. 2.7 +# Generated by GNU Autoconf 2.68 for masqmail 0.2.30. 2.8 # 2.9 # Report bugs to <meillo@marmaro.de>. 2.10 # 2.11 # 2.12 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2.13 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 2.14 -# Inc. 2.15 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 2.16 +# Foundation, Inc. 2.17 # 2.18 # 2.19 # This configure script is free software; the Free Software Foundation 2.20 @@ -91,6 +91,7 @@ 2.21 IFS=" "" $as_nl" 2.22 2.23 # Find who we are. Look in the path if we contain no directory separator. 2.24 +as_myself= 2.25 case $0 in #(( 2.26 *[\\/]* ) as_myself=$0 ;; 2.27 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.28 @@ -216,11 +217,18 @@ 2.29 # We cannot yet assume a decent shell, so we have to provide a 2.30 # neutralization value for shells without unset; and this also 2.31 # works around shells that cannot unset nonexistent variables. 2.32 + # Preserve -v and -x to the replacement shell. 2.33 BASH_ENV=/dev/null 2.34 ENV=/dev/null 2.35 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 2.36 export CONFIG_SHELL 2.37 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 2.38 + case $- in # (((( 2.39 + *v*x* | *x*v* ) as_opts=-vx ;; 2.40 + *v* ) as_opts=-v ;; 2.41 + *x* ) as_opts=-x ;; 2.42 + * ) as_opts= ;; 2.43 + esac 2.44 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 2.45 fi 2.46 2.47 if test x$as_have_required = xno; then : 2.48 @@ -319,7 +327,7 @@ 2.49 test -d "$as_dir" && break 2.50 done 2.51 test -z "$as_dirs" || eval "mkdir $as_dirs" 2.52 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 2.53 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 2.54 2.55 2.56 } # as_fn_mkdir_p 2.57 @@ -359,19 +367,19 @@ 2.58 fi # as_fn_arith 2.59 2.60 2.61 -# as_fn_error ERROR [LINENO LOG_FD] 2.62 -# --------------------------------- 2.63 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 2.64 +# ---------------------------------------- 2.65 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 2.66 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 2.67 -# script with status $?, using 1 if that was 0. 2.68 +# script with STATUS, using 1 if that was 0. 2.69 as_fn_error () 2.70 { 2.71 - as_status=$?; test $as_status -eq 0 && as_status=1 2.72 - if test "$3"; then 2.73 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.74 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 2.75 + as_status=$1; test $as_status -eq 0 && as_status=1 2.76 + if test "$4"; then 2.77 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.78 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 2.79 fi 2.80 - $as_echo "$as_me: error: $1" >&2 2.81 + $as_echo "$as_me: error: $2" >&2 2.82 as_fn_exit $as_status 2.83 } # as_fn_error 2.84 2.85 @@ -533,7 +541,7 @@ 2.86 exec 6>&1 2.87 2.88 # Name of the host. 2.89 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 2.90 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 2.91 # so uname gets run too. 2.92 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 2.93 2.94 @@ -552,8 +560,8 @@ 2.95 # Identity of this package. 2.96 PACKAGE_NAME='masqmail' 2.97 PACKAGE_TARNAME='masqmail' 2.98 -PACKAGE_VERSION='0.2.30-dev' 2.99 -PACKAGE_STRING='masqmail 0.2.30-dev' 2.100 +PACKAGE_VERSION='0.2.30' 2.101 +PACKAGE_STRING='masqmail 0.2.30' 2.102 PACKAGE_BUGREPORT='meillo@marmaro.de' 2.103 PACKAGE_URL='' 2.104 2.105 @@ -793,8 +801,9 @@ 2.106 fi 2.107 2.108 case $ac_option in 2.109 - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 2.110 - *) ac_optarg=yes ;; 2.111 + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 2.112 + *=) ac_optarg= ;; 2.113 + *) ac_optarg=yes ;; 2.114 esac 2.115 2.116 # Accept the important Cygnus configure options, so we can diagnose typos. 2.117 @@ -839,7 +848,7 @@ 2.118 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 2.119 # Reject names that are not valid shell variable names. 2.120 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.121 - as_fn_error "invalid feature name: $ac_useropt" 2.122 + as_fn_error $? "invalid feature name: $ac_useropt" 2.123 ac_useropt_orig=$ac_useropt 2.124 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.125 case $ac_user_opts in 2.126 @@ -865,7 +874,7 @@ 2.127 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 2.128 # Reject names that are not valid shell variable names. 2.129 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.130 - as_fn_error "invalid feature name: $ac_useropt" 2.131 + as_fn_error $? "invalid feature name: $ac_useropt" 2.132 ac_useropt_orig=$ac_useropt 2.133 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.134 case $ac_user_opts in 2.135 @@ -1069,7 +1078,7 @@ 2.136 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 2.137 # Reject names that are not valid shell variable names. 2.138 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.139 - as_fn_error "invalid package name: $ac_useropt" 2.140 + as_fn_error $? "invalid package name: $ac_useropt" 2.141 ac_useropt_orig=$ac_useropt 2.142 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.143 case $ac_user_opts in 2.144 @@ -1085,7 +1094,7 @@ 2.145 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 2.146 # Reject names that are not valid shell variable names. 2.147 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.148 - as_fn_error "invalid package name: $ac_useropt" 2.149 + as_fn_error $? "invalid package name: $ac_useropt" 2.150 ac_useropt_orig=$ac_useropt 2.151 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.152 case $ac_user_opts in 2.153 @@ -1115,8 +1124,8 @@ 2.154 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 2.155 x_libraries=$ac_optarg ;; 2.156 2.157 - -*) as_fn_error "unrecognized option: \`$ac_option' 2.158 -Try \`$0 --help' for more information." 2.159 + -*) as_fn_error $? "unrecognized option: \`$ac_option' 2.160 +Try \`$0 --help' for more information" 2.161 ;; 2.162 2.163 *=*) 2.164 @@ -1124,7 +1133,7 @@ 2.165 # Reject names that are not valid shell variable names. 2.166 case $ac_envvar in #( 2.167 '' | [0-9]* | *[!_$as_cr_alnum]* ) 2.168 - as_fn_error "invalid variable name: \`$ac_envvar'" ;; 2.169 + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 2.170 esac 2.171 eval $ac_envvar=\$ac_optarg 2.172 export $ac_envvar ;; 2.173 @@ -1134,7 +1143,7 @@ 2.174 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 2.175 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 2.176 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 2.177 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 2.178 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 2.179 ;; 2.180 2.181 esac 2.182 @@ -1142,13 +1151,13 @@ 2.183 2.184 if test -n "$ac_prev"; then 2.185 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 2.186 - as_fn_error "missing argument to $ac_option" 2.187 + as_fn_error $? "missing argument to $ac_option" 2.188 fi 2.189 2.190 if test -n "$ac_unrecognized_opts"; then 2.191 case $enable_option_checking in 2.192 no) ;; 2.193 - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 2.194 + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 2.195 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 2.196 esac 2.197 fi 2.198 @@ -1171,7 +1180,7 @@ 2.199 [\\/$]* | ?:[\\/]* ) continue;; 2.200 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 2.201 esac 2.202 - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 2.203 + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 2.204 done 2.205 2.206 # There might be people who depend on the old broken behavior: `$host' 2.207 @@ -1185,8 +1194,8 @@ 2.208 if test "x$host_alias" != x; then 2.209 if test "x$build_alias" = x; then 2.210 cross_compiling=maybe 2.211 - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 2.212 - If a cross compiler is detected then cross compile mode will be used." >&2 2.213 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 2.214 + If a cross compiler is detected then cross compile mode will be used" >&2 2.215 elif test "x$build_alias" != "x$host_alias"; then 2.216 cross_compiling=yes 2.217 fi 2.218 @@ -1201,9 +1210,9 @@ 2.219 ac_pwd=`pwd` && test -n "$ac_pwd" && 2.220 ac_ls_di=`ls -di .` && 2.221 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 2.222 - as_fn_error "working directory cannot be determined" 2.223 + as_fn_error $? "working directory cannot be determined" 2.224 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 2.225 - as_fn_error "pwd does not report name of working directory" 2.226 + as_fn_error $? "pwd does not report name of working directory" 2.227 2.228 2.229 # Find the source files, if location was not specified. 2.230 @@ -1242,11 +1251,11 @@ 2.231 fi 2.232 if test ! -r "$srcdir/$ac_unique_file"; then 2.233 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 2.234 - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 2.235 + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 2.236 fi 2.237 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 2.238 ac_abs_confdir=`( 2.239 - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 2.240 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 2.241 pwd)` 2.242 # When building in place, set srcdir=. 2.243 if test "$ac_abs_confdir" = "$ac_pwd"; then 2.244 @@ -1272,7 +1281,7 @@ 2.245 # Omit some internal or obsolete options to make the list less imposing. 2.246 # This message is too long to be a string in the A/UX 3.1 sh. 2.247 cat <<_ACEOF 2.248 -\`configure' configures masqmail 0.2.30-dev to adapt to many kinds of systems. 2.249 +\`configure' configures masqmail 0.2.30 to adapt to many kinds of systems. 2.250 2.251 Usage: $0 [OPTION]... [VAR=VALUE]... 2.252 2.253 @@ -1286,7 +1295,7 @@ 2.254 --help=short display options specific to this package 2.255 --help=recursive display the short help of all the included packages 2.256 -V, --version display version information and exit 2.257 - -q, --quiet, --silent do not print \`checking...' messages 2.258 + -q, --quiet, --silent do not print \`checking ...' messages 2.259 --cache-file=FILE cache test results in FILE [disabled] 2.260 -C, --config-cache alias for \`--cache-file=config.cache' 2.261 -n, --no-create do not create output files 2.262 @@ -1338,7 +1347,7 @@ 2.263 2.264 if test -n "$ac_init_help"; then 2.265 case $ac_init_help in 2.266 - short | recursive ) echo "Configuration of masqmail 0.2.30-dev:";; 2.267 + short | recursive ) echo "Configuration of masqmail 0.2.30:";; 2.268 esac 2.269 cat <<\_ACEOF 2.270 2.271 @@ -1452,10 +1461,10 @@ 2.272 test -n "$ac_init_help" && exit $ac_status 2.273 if $ac_init_version; then 2.274 cat <<\_ACEOF 2.275 -masqmail configure 0.2.30-dev 2.276 -generated by GNU Autoconf 2.65 2.277 - 2.278 -Copyright (C) 2009 Free Software Foundation, Inc. 2.279 +masqmail configure 0.2.30 2.280 +generated by GNU Autoconf 2.68 2.281 + 2.282 +Copyright (C) 2010 Free Software Foundation, Inc. 2.283 This configure script is free software; the Free Software Foundation 2.284 gives unlimited permission to copy, distribute and modify it. 2.285 _ACEOF 2.286 @@ -1499,7 +1508,7 @@ 2.287 2.288 ac_retval=1 2.289 fi 2.290 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.291 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.292 as_fn_set_status $ac_retval 2.293 2.294 } # ac_fn_c_try_compile 2.295 @@ -1545,7 +1554,7 @@ 2.296 # interfere with the next link command; also delete a directory that is 2.297 # left behind by Apple's compiler. We do this before executing the actions. 2.298 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2.299 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.300 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.301 as_fn_set_status $ac_retval 2.302 2.303 } # ac_fn_c_try_link 2.304 @@ -1571,7 +1580,7 @@ 2.305 mv -f conftest.er1 conftest.err 2.306 fi 2.307 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2.308 - test $ac_status = 0; } >/dev/null && { 2.309 + test $ac_status = 0; } > conftest.i && { 2.310 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 2.311 test ! -s conftest.err 2.312 }; then : 2.313 @@ -1582,7 +1591,7 @@ 2.314 2.315 ac_retval=1 2.316 fi 2.317 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.318 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.319 as_fn_set_status $ac_retval 2.320 2.321 } # ac_fn_c_try_cpp 2.322 @@ -1624,7 +1633,7 @@ 2.323 ac_retval=$ac_status 2.324 fi 2.325 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2.326 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.327 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.328 as_fn_set_status $ac_retval 2.329 2.330 } # ac_fn_c_try_run 2.331 @@ -1637,7 +1646,7 @@ 2.332 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.334 $as_echo_n "checking for $2... " >&6; } 2.335 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.336 +if eval \${$3+:} false; then : 2.337 $as_echo_n "(cached) " >&6 2.338 else 2.339 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.340 @@ -1692,7 +1701,7 @@ 2.341 eval ac_res=\$$3 2.342 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.343 $as_echo "$ac_res" >&6; } 2.344 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.345 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.346 2.347 } # ac_fn_c_check_func 2.348 2.349 @@ -1704,10 +1713,10 @@ 2.350 ac_fn_c_check_header_mongrel () 2.351 { 2.352 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.353 - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.354 + if eval \${$3+:} false; then : 2.355 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.356 $as_echo_n "checking for $2... " >&6; } 2.357 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.358 +if eval \${$3+:} false; then : 2.359 $as_echo_n "(cached) " >&6 2.360 fi 2.361 eval ac_res=\$$3 2.362 @@ -1743,7 +1752,7 @@ 2.363 else 2.364 ac_header_preproc=no 2.365 fi 2.366 -rm -f conftest.err conftest.$ac_ext 2.367 +rm -f conftest.err conftest.i conftest.$ac_ext 2.368 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2.369 $as_echo "$ac_header_preproc" >&6; } 2.370 2.371 @@ -1766,17 +1775,15 @@ 2.372 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 2.373 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2.374 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2.375 -( cat <<\_ASBOX 2.376 -## -------------------------------- ## 2.377 +( $as_echo "## -------------------------------- ## 2.378 ## Report this to meillo@marmaro.de ## 2.379 -## -------------------------------- ## 2.380 -_ASBOX 2.381 +## -------------------------------- ##" 2.382 ) | sed "s/^/$as_me: WARNING: /" >&2 2.383 ;; 2.384 esac 2.385 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.386 $as_echo_n "checking for $2... " >&6; } 2.387 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.388 +if eval \${$3+:} false; then : 2.389 $as_echo_n "(cached) " >&6 2.390 else 2.391 eval "$3=\$ac_header_compiler" 2.392 @@ -1785,7 +1792,7 @@ 2.393 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.394 $as_echo "$ac_res" >&6; } 2.395 fi 2.396 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.397 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.398 2.399 } # ac_fn_c_check_header_mongrel 2.400 2.401 @@ -1798,7 +1805,7 @@ 2.402 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.403 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.404 $as_echo_n "checking for $2... " >&6; } 2.405 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.406 +if eval \${$3+:} false; then : 2.407 $as_echo_n "(cached) " >&6 2.408 else 2.409 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.410 @@ -1816,7 +1823,7 @@ 2.411 eval ac_res=\$$3 2.412 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.413 $as_echo "$ac_res" >&6; } 2.414 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.415 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.416 2.417 } # ac_fn_c_check_header_compile 2.418 2.419 @@ -1829,7 +1836,7 @@ 2.420 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.421 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.422 $as_echo_n "checking for $2... " >&6; } 2.423 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.424 +if eval \${$3+:} false; then : 2.425 $as_echo_n "(cached) " >&6 2.426 else 2.427 eval "$3=no" 2.428 @@ -1870,15 +1877,15 @@ 2.429 eval ac_res=\$$3 2.430 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.431 $as_echo "$ac_res" >&6; } 2.432 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.433 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.434 2.435 } # ac_fn_c_check_type 2.436 cat >config.log <<_ACEOF 2.437 This file contains any messages produced by compilers while 2.438 running configure, to aid debugging if configure makes a mistake. 2.439 2.440 -It was created by masqmail $as_me 0.2.30-dev, which was 2.441 -generated by GNU Autoconf 2.65. Invocation command line was 2.442 +It was created by masqmail $as_me 0.2.30, which was 2.443 +generated by GNU Autoconf 2.68. Invocation command line was 2.444 2.445 $ $0 $@ 2.446 2.447 @@ -1988,11 +1995,9 @@ 2.448 { 2.449 echo 2.450 2.451 - cat <<\_ASBOX 2.452 -## ---------------- ## 2.453 + $as_echo "## ---------------- ## 2.454 ## Cache variables. ## 2.455 -## ---------------- ## 2.456 -_ASBOX 2.457 +## ---------------- ##" 2.458 echo 2.459 # The following way of writing the cache mishandles newlines in values, 2.460 ( 2.461 @@ -2026,11 +2031,9 @@ 2.462 ) 2.463 echo 2.464 2.465 - cat <<\_ASBOX 2.466 -## ----------------- ## 2.467 + $as_echo "## ----------------- ## 2.468 ## Output variables. ## 2.469 -## ----------------- ## 2.470 -_ASBOX 2.471 +## ----------------- ##" 2.472 echo 2.473 for ac_var in $ac_subst_vars 2.474 do 2.475 @@ -2043,11 +2046,9 @@ 2.476 echo 2.477 2.478 if test -n "$ac_subst_files"; then 2.479 - cat <<\_ASBOX 2.480 -## ------------------- ## 2.481 + $as_echo "## ------------------- ## 2.482 ## File substitutions. ## 2.483 -## ------------------- ## 2.484 -_ASBOX 2.485 +## ------------------- ##" 2.486 echo 2.487 for ac_var in $ac_subst_files 2.488 do 2.489 @@ -2061,11 +2062,9 @@ 2.490 fi 2.491 2.492 if test -s confdefs.h; then 2.493 - cat <<\_ASBOX 2.494 -## ----------- ## 2.495 + $as_echo "## ----------- ## 2.496 ## confdefs.h. ## 2.497 -## ----------- ## 2.498 -_ASBOX 2.499 +## ----------- ##" 2.500 echo 2.501 cat confdefs.h 2.502 echo 2.503 @@ -2120,7 +2119,12 @@ 2.504 ac_site_file1=NONE 2.505 ac_site_file2=NONE 2.506 if test -n "$CONFIG_SITE"; then 2.507 - ac_site_file1=$CONFIG_SITE 2.508 + # We do not want a PATH search for config.site. 2.509 + case $CONFIG_SITE in #(( 2.510 + -*) ac_site_file1=./$CONFIG_SITE;; 2.511 + */*) ac_site_file1=$CONFIG_SITE;; 2.512 + *) ac_site_file1=./$CONFIG_SITE;; 2.513 + esac 2.514 elif test "x$prefix" != xNONE; then 2.515 ac_site_file1=$prefix/share/config.site 2.516 ac_site_file2=$prefix/etc/config.site 2.517 @@ -2135,7 +2139,11 @@ 2.518 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2.519 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2.520 sed 's/^/| /' "$ac_site_file" >&5 2.521 - . "$ac_site_file" 2.522 + . "$ac_site_file" \ 2.523 + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.524 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.525 +as_fn_error $? "failed to load site script $ac_site_file 2.526 +See \`config.log' for more details" "$LINENO" 5; } 2.527 fi 2.528 done 2.529 2.530 @@ -2211,7 +2219,7 @@ 2.531 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.532 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2.533 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2.534 - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2.535 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2.536 fi 2.537 ## -------------------- ## 2.538 ## Main body of script. ## 2.539 @@ -2231,16 +2239,22 @@ 2.540 2.541 ac_aux_dir= 2.542 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2.543 - for ac_t in install-sh install.sh shtool; do 2.544 - if test -f "$ac_dir/$ac_t"; then 2.545 - ac_aux_dir=$ac_dir 2.546 - ac_install_sh="$ac_aux_dir/$ac_t -c" 2.547 - break 2 2.548 - fi 2.549 - done 2.550 + if test -f "$ac_dir/install-sh"; then 2.551 + ac_aux_dir=$ac_dir 2.552 + ac_install_sh="$ac_aux_dir/install-sh -c" 2.553 + break 2.554 + elif test -f "$ac_dir/install.sh"; then 2.555 + ac_aux_dir=$ac_dir 2.556 + ac_install_sh="$ac_aux_dir/install.sh -c" 2.557 + break 2.558 + elif test -f "$ac_dir/shtool"; then 2.559 + ac_aux_dir=$ac_dir 2.560 + ac_install_sh="$ac_aux_dir/shtool install -c" 2.561 + break 2.562 + fi 2.563 done 2.564 if test -z "$ac_aux_dir"; then 2.565 - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2.566 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2.567 fi 2.568 2.569 # These three variables are undocumented and unsupported, 2.570 @@ -2269,7 +2283,7 @@ 2.571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 2.572 $as_echo_n "checking for a BSD-compatible install... " >&6; } 2.573 if test -z "$INSTALL"; then 2.574 -if test "${ac_cv_path_install+set}" = set; then : 2.575 +if ${ac_cv_path_install+:} false; then : 2.576 $as_echo_n "(cached) " >&6 2.577 else 2.578 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.579 @@ -2356,11 +2370,11 @@ 2.580 ' 2.581 case `pwd` in 2.582 *[\\\"\#\$\&\'\`$am_lf]*) 2.583 - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; 2.584 + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; 2.585 esac 2.586 case $srcdir in 2.587 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 2.588 - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 2.589 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 2.590 esac 2.591 2.592 # Do `set' in a subshell so we don't clobber the current shell's 2.593 @@ -2382,7 +2396,7 @@ 2.594 # if, for instance, CONFIG_SHELL is bash and it inherits a 2.595 # broken ls alias from the environment. This has actually 2.596 # happened. Such a system could not be considered "sane". 2.597 - as_fn_error "ls -t appears to fail. Make sure there is not a broken 2.598 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 2.599 alias in your environment" "$LINENO" 5 2.600 fi 2.601 2.602 @@ -2392,7 +2406,7 @@ 2.603 # Ok. 2.604 : 2.605 else 2.606 - as_fn_error "newly created file is older than distributed files! 2.607 + as_fn_error $? "newly created file is older than distributed files! 2.608 Check your system clock" "$LINENO" 5 2.609 fi 2.610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.611 @@ -2446,7 +2460,7 @@ 2.612 set dummy ${ac_tool_prefix}strip; ac_word=$2 2.613 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.614 $as_echo_n "checking for $ac_word... " >&6; } 2.615 -if test "${ac_cv_prog_STRIP+set}" = set; then : 2.616 +if ${ac_cv_prog_STRIP+:} false; then : 2.617 $as_echo_n "(cached) " >&6 2.618 else 2.619 if test -n "$STRIP"; then 2.620 @@ -2486,7 +2500,7 @@ 2.621 set dummy strip; ac_word=$2 2.622 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.623 $as_echo_n "checking for $ac_word... " >&6; } 2.624 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 2.625 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 2.626 $as_echo_n "(cached) " >&6 2.627 else 2.628 if test -n "$ac_ct_STRIP"; then 2.629 @@ -2539,7 +2553,7 @@ 2.630 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 2.631 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } 2.632 if test -z "$MKDIR_P"; then 2.633 - if test "${ac_cv_path_mkdir+set}" = set; then : 2.634 + if ${ac_cv_path_mkdir+:} false; then : 2.635 $as_echo_n "(cached) " >&6 2.636 else 2.637 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.638 @@ -2590,7 +2604,7 @@ 2.639 set dummy $ac_prog; ac_word=$2 2.640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.641 $as_echo_n "checking for $ac_word... " >&6; } 2.642 -if test "${ac_cv_prog_AWK+set}" = set; then : 2.643 +if ${ac_cv_prog_AWK+:} false; then : 2.644 $as_echo_n "(cached) " >&6 2.645 else 2.646 if test -n "$AWK"; then 2.647 @@ -2630,7 +2644,7 @@ 2.648 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2.649 set x ${MAKE-make} 2.650 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2.651 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 2.652 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : 2.653 $as_echo_n "(cached) " >&6 2.654 else 2.655 cat >conftest.make <<\_ACEOF 2.656 @@ -2638,7 +2652,7 @@ 2.657 all: 2.658 @echo '@@@%%%=$(MAKE)=@@@%%%' 2.659 _ACEOF 2.660 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 2.661 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 2.662 case `${MAKE-make} -f conftest.make 2>/dev/null` in 2.663 *@@@%%%=?*=@@@%%%*) 2.664 eval ac_cv_prog_make_${ac_make}_set=yes;; 2.665 @@ -2672,7 +2686,7 @@ 2.666 am__isrc=' -I$(srcdir)' 2.667 # test to see if srcdir already configured 2.668 if test -f $srcdir/config.status; then 2.669 - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 2.670 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 2.671 fi 2.672 fi 2.673 2.674 @@ -2688,7 +2702,7 @@ 2.675 2.676 # Define the identity of the package. 2.677 PACKAGE='masqmail' 2.678 - VERSION='0.2.30-dev' 2.679 + VERSION='0.2.30' 2.680 2.681 2.682 cat >>confdefs.h <<_ACEOF 2.683 @@ -2741,7 +2755,7 @@ 2.684 set dummy ${ac_tool_prefix}gcc; ac_word=$2 2.685 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.686 $as_echo_n "checking for $ac_word... " >&6; } 2.687 -if test "${ac_cv_prog_CC+set}" = set; then : 2.688 +if ${ac_cv_prog_CC+:} false; then : 2.689 $as_echo_n "(cached) " >&6 2.690 else 2.691 if test -n "$CC"; then 2.692 @@ -2781,7 +2795,7 @@ 2.693 set dummy gcc; ac_word=$2 2.694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.695 $as_echo_n "checking for $ac_word... " >&6; } 2.696 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 2.697 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 2.698 $as_echo_n "(cached) " >&6 2.699 else 2.700 if test -n "$ac_ct_CC"; then 2.701 @@ -2834,7 +2848,7 @@ 2.702 set dummy ${ac_tool_prefix}cc; ac_word=$2 2.703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.704 $as_echo_n "checking for $ac_word... " >&6; } 2.705 -if test "${ac_cv_prog_CC+set}" = set; then : 2.706 +if ${ac_cv_prog_CC+:} false; then : 2.707 $as_echo_n "(cached) " >&6 2.708 else 2.709 if test -n "$CC"; then 2.710 @@ -2874,7 +2888,7 @@ 2.711 set dummy cc; ac_word=$2 2.712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.713 $as_echo_n "checking for $ac_word... " >&6; } 2.714 -if test "${ac_cv_prog_CC+set}" = set; then : 2.715 +if ${ac_cv_prog_CC+:} false; then : 2.716 $as_echo_n "(cached) " >&6 2.717 else 2.718 if test -n "$CC"; then 2.719 @@ -2933,7 +2947,7 @@ 2.720 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.721 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.722 $as_echo_n "checking for $ac_word... " >&6; } 2.723 -if test "${ac_cv_prog_CC+set}" = set; then : 2.724 +if ${ac_cv_prog_CC+:} false; then : 2.725 $as_echo_n "(cached) " >&6 2.726 else 2.727 if test -n "$CC"; then 2.728 @@ -2977,7 +2991,7 @@ 2.729 set dummy $ac_prog; ac_word=$2 2.730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.731 $as_echo_n "checking for $ac_word... " >&6; } 2.732 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 2.733 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 2.734 $as_echo_n "(cached) " >&6 2.735 else 2.736 if test -n "$ac_ct_CC"; then 2.737 @@ -3031,8 +3045,8 @@ 2.738 2.739 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.740 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.741 -as_fn_error "no acceptable C compiler found in \$PATH 2.742 -See \`config.log' for more details." "$LINENO" 5; } 2.743 +as_fn_error $? "no acceptable C compiler found in \$PATH 2.744 +See \`config.log' for more details" "$LINENO" 5; } 2.745 2.746 # Provide some information about the compiler. 2.747 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 2.748 @@ -3146,9 +3160,8 @@ 2.749 2.750 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.751 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.752 -{ as_fn_set_status 77 2.753 -as_fn_error "C compiler cannot create executables 2.754 -See \`config.log' for more details." "$LINENO" 5; }; } 2.755 +as_fn_error 77 "C compiler cannot create executables 2.756 +See \`config.log' for more details" "$LINENO" 5; } 2.757 else 2.758 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.759 $as_echo "yes" >&6; } 2.760 @@ -3190,8 +3203,8 @@ 2.761 else 2.762 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.763 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.764 -as_fn_error "cannot compute suffix of executables: cannot compile and link 2.765 -See \`config.log' for more details." "$LINENO" 5; } 2.766 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link 2.767 +See \`config.log' for more details" "$LINENO" 5; } 2.768 fi 2.769 rm -f conftest conftest$ac_cv_exeext 2.770 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 2.771 @@ -3248,9 +3261,9 @@ 2.772 else 2.773 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.774 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.775 -as_fn_error "cannot run C compiled programs. 2.776 +as_fn_error $? "cannot run C compiled programs. 2.777 If you meant to cross compile, use \`--host'. 2.778 -See \`config.log' for more details." "$LINENO" 5; } 2.779 +See \`config.log' for more details" "$LINENO" 5; } 2.780 fi 2.781 fi 2.782 fi 2.783 @@ -3261,7 +3274,7 @@ 2.784 ac_clean_files=$ac_clean_files_save 2.785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 2.786 $as_echo_n "checking for suffix of object files... " >&6; } 2.787 -if test "${ac_cv_objext+set}" = set; then : 2.788 +if ${ac_cv_objext+:} false; then : 2.789 $as_echo_n "(cached) " >&6 2.790 else 2.791 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.792 @@ -3301,8 +3314,8 @@ 2.793 2.794 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.795 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.796 -as_fn_error "cannot compute suffix of object files: cannot compile 2.797 -See \`config.log' for more details." "$LINENO" 5; } 2.798 +as_fn_error $? "cannot compute suffix of object files: cannot compile 2.799 +See \`config.log' for more details" "$LINENO" 5; } 2.800 fi 2.801 rm -f conftest.$ac_cv_objext conftest.$ac_ext 2.802 fi 2.803 @@ -3312,7 +3325,7 @@ 2.804 ac_objext=$OBJEXT 2.805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 2.806 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 2.807 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 2.808 +if ${ac_cv_c_compiler_gnu+:} false; then : 2.809 $as_echo_n "(cached) " >&6 2.810 else 2.811 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.812 @@ -3349,7 +3362,7 @@ 2.813 ac_save_CFLAGS=$CFLAGS 2.814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 2.815 $as_echo_n "checking whether $CC accepts -g... " >&6; } 2.816 -if test "${ac_cv_prog_cc_g+set}" = set; then : 2.817 +if ${ac_cv_prog_cc_g+:} false; then : 2.818 $as_echo_n "(cached) " >&6 2.819 else 2.820 ac_save_c_werror_flag=$ac_c_werror_flag 2.821 @@ -3427,7 +3440,7 @@ 2.822 fi 2.823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 2.824 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 2.825 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 2.826 +if ${ac_cv_prog_cc_c89+:} false; then : 2.827 $as_echo_n "(cached) " >&6 2.828 else 2.829 ac_cv_prog_cc_c89=no 2.830 @@ -3588,7 +3601,7 @@ 2.831 2.832 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 2.833 $as_echo_n "checking dependency style of $depcc... " >&6; } 2.834 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : 2.835 +if ${am_cv_CC_dependencies_compiler_type+:} false; then : 2.836 $as_echo_n "(cached) " >&6 2.837 else 2.838 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then 2.839 @@ -3714,7 +3727,7 @@ 2.840 2.841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 2.842 $as_echo_n "checking for library containing strerror... " >&6; } 2.843 -if test "${ac_cv_search_strerror+set}" = set; then : 2.844 +if ${ac_cv_search_strerror+:} false; then : 2.845 $as_echo_n "(cached) " >&6 2.846 else 2.847 ac_func_search_save_LIBS=$LIBS 2.848 @@ -3748,11 +3761,11 @@ 2.849 fi 2.850 rm -f core conftest.err conftest.$ac_objext \ 2.851 conftest$ac_exeext 2.852 - if test "${ac_cv_search_strerror+set}" = set; then : 2.853 + if ${ac_cv_search_strerror+:} false; then : 2.854 break 2.855 fi 2.856 done 2.857 -if test "${ac_cv_search_strerror+set}" = set; then : 2.858 +if ${ac_cv_search_strerror+:} false; then : 2.859 2.860 else 2.861 ac_cv_search_strerror=no 2.862 @@ -3780,7 +3793,7 @@ 2.863 CPP= 2.864 fi 2.865 if test -z "$CPP"; then 2.866 - if test "${ac_cv_prog_CPP+set}" = set; then : 2.867 + if ${ac_cv_prog_CPP+:} false; then : 2.868 $as_echo_n "(cached) " >&6 2.869 else 2.870 # Double quotes because CPP needs to be expanded 2.871 @@ -3810,7 +3823,7 @@ 2.872 # Broken: fails on valid input. 2.873 continue 2.874 fi 2.875 -rm -f conftest.err conftest.$ac_ext 2.876 +rm -f conftest.err conftest.i conftest.$ac_ext 2.877 2.878 # OK, works on sane cases. Now check whether nonexistent headers 2.879 # can be detected and how. 2.880 @@ -3826,11 +3839,11 @@ 2.881 ac_preproc_ok=: 2.882 break 2.883 fi 2.884 -rm -f conftest.err conftest.$ac_ext 2.885 +rm -f conftest.err conftest.i conftest.$ac_ext 2.886 2.887 done 2.888 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2.889 -rm -f conftest.err conftest.$ac_ext 2.890 +rm -f conftest.i conftest.err conftest.$ac_ext 2.891 if $ac_preproc_ok; then : 2.892 break 2.893 fi 2.894 @@ -3869,7 +3882,7 @@ 2.895 # Broken: fails on valid input. 2.896 continue 2.897 fi 2.898 -rm -f conftest.err conftest.$ac_ext 2.899 +rm -f conftest.err conftest.i conftest.$ac_ext 2.900 2.901 # OK, works on sane cases. Now check whether nonexistent headers 2.902 # can be detected and how. 2.903 @@ -3885,18 +3898,18 @@ 2.904 ac_preproc_ok=: 2.905 break 2.906 fi 2.907 -rm -f conftest.err conftest.$ac_ext 2.908 +rm -f conftest.err conftest.i conftest.$ac_ext 2.909 2.910 done 2.911 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2.912 -rm -f conftest.err conftest.$ac_ext 2.913 +rm -f conftest.i conftest.err conftest.$ac_ext 2.914 if $ac_preproc_ok; then : 2.915 2.916 else 2.917 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.918 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.919 -as_fn_error "C preprocessor \"$CPP\" fails sanity check 2.920 -See \`config.log' for more details." "$LINENO" 5; } 2.921 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 2.922 +See \`config.log' for more details" "$LINENO" 5; } 2.923 fi 2.924 2.925 ac_ext=c 2.926 @@ -3908,7 +3921,7 @@ 2.927 2.928 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 2.929 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 2.930 -if test "${ac_cv_path_GREP+set}" = set; then : 2.931 +if ${ac_cv_path_GREP+:} false; then : 2.932 $as_echo_n "(cached) " >&6 2.933 else 2.934 if test -z "$GREP"; then 2.935 @@ -3957,7 +3970,7 @@ 2.936 done 2.937 IFS=$as_save_IFS 2.938 if test -z "$ac_cv_path_GREP"; then 2.939 - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.940 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.941 fi 2.942 else 2.943 ac_cv_path_GREP=$GREP 2.944 @@ -3971,7 +3984,7 @@ 2.945 2.946 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 2.947 $as_echo_n "checking for egrep... " >&6; } 2.948 -if test "${ac_cv_path_EGREP+set}" = set; then : 2.949 +if ${ac_cv_path_EGREP+:} false; then : 2.950 $as_echo_n "(cached) " >&6 2.951 else 2.952 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 2.953 @@ -4023,7 +4036,7 @@ 2.954 done 2.955 IFS=$as_save_IFS 2.956 if test -z "$ac_cv_path_EGREP"; then 2.957 - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.958 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.959 fi 2.960 else 2.961 ac_cv_path_EGREP=$EGREP 2.962 @@ -4038,7 +4051,7 @@ 2.963 2.964 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 2.965 $as_echo_n "checking for ANSI C header files... " >&6; } 2.966 -if test "${ac_cv_header_stdc+set}" = set; then : 2.967 +if ${ac_cv_header_stdc+:} false; then : 2.968 $as_echo_n "(cached) " >&6 2.969 else 2.970 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.971 @@ -4153,7 +4166,7 @@ 2.972 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 2.973 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.974 $as_echo_n "checking for $ac_word... " >&6; } 2.975 -if test "${ac_cv_prog_RANLIB+set}" = set; then : 2.976 +if ${ac_cv_prog_RANLIB+:} false; then : 2.977 $as_echo_n "(cached) " >&6 2.978 else 2.979 if test -n "$RANLIB"; then 2.980 @@ -4193,7 +4206,7 @@ 2.981 set dummy ranlib; ac_word=$2 2.982 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.983 $as_echo_n "checking for $ac_word... " >&6; } 2.984 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : 2.985 +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : 2.986 $as_echo_n "(cached) " >&6 2.987 else 2.988 if test -n "$ac_ct_RANLIB"; then 2.989 @@ -4253,7 +4266,7 @@ 2.990 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 2.991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.992 $as_echo_n "checking for $ac_word... " >&6; } 2.993 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 2.994 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 2.995 $as_echo_n "(cached) " >&6 2.996 else 2.997 case $PKG_CONFIG in 2.998 @@ -4296,7 +4309,7 @@ 2.999 set dummy pkg-config; ac_word=$2 2.1000 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1001 $as_echo_n "checking for $ac_word... " >&6; } 2.1002 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 2.1003 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 2.1004 $as_echo_n "(cached) " >&6 2.1005 else 2.1006 case $ac_pt_PKG_CONFIG in 2.1007 @@ -4417,7 +4430,7 @@ 2.1008 # Put the nasty error message in config.log where it belongs 2.1009 echo "$GLIB_PKG_ERRORS" >&5 2.1010 2.1011 - as_fn_error "Package requirements (glib-2.0) were not met: 2.1012 + as_fn_error $? "Package requirements (glib-2.0) were not met: 2.1013 2.1014 $GLIB_PKG_ERRORS 2.1015 2.1016 @@ -4432,7 +4445,7 @@ 2.1017 $as_echo "no" >&6; } 2.1018 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1019 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1020 -as_fn_error "The pkg-config script could not be found or is too old. Make sure it 2.1021 +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 2.1022 is in your PATH or set the PKG_CONFIG environment variable to the full 2.1023 path to pkg-config. 2.1024 2.1025 @@ -4441,7 +4454,7 @@ 2.1026 See the pkg-config man page for more details. 2.1027 2.1028 To get pkg-config, see <http://pkg-config.freedesktop.org/>. 2.1029 -See \`config.log' for more details." "$LINENO" 5; } 2.1030 +See \`config.log' for more details" "$LINENO" 5; } 2.1031 else 2.1032 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS 2.1033 GLIB_LIBS=$pkg_cv_GLIB_LIBS 2.1034 @@ -4469,7 +4482,7 @@ 2.1035 2.1036 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lc" >&5 2.1037 $as_echo_n "checking for res_search in -lc... " >&6; } 2.1038 -if test "${ac_cv_lib_c_res_search+set}" = set; then : 2.1039 +if ${ac_cv_lib_c_res_search+:} false; then : 2.1040 $as_echo_n "(cached) " >&6 2.1041 else 2.1042 ac_check_lib_save_LIBS=$LIBS 2.1043 @@ -4503,7 +4516,7 @@ 2.1044 fi 2.1045 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_res_search" >&5 2.1046 $as_echo "$ac_cv_lib_c_res_search" >&6; } 2.1047 -if test "x$ac_cv_lib_c_res_search" = x""yes; then : 2.1048 +if test "x$ac_cv_lib_c_res_search" = xyes; then : 2.1049 need_resolv=no 2.1050 else 2.1051 need_resolv=yes 2.1052 @@ -4512,7 +4525,7 @@ 2.1053 if test "$need_resolv" = yes; then 2.1054 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 2.1055 $as_echo_n "checking for res_search in -lresolv... " >&6; } 2.1056 -if test "${ac_cv_lib_resolv_res_search+set}" = set; then : 2.1057 +if ${ac_cv_lib_resolv_res_search+:} false; then : 2.1058 $as_echo_n "(cached) " >&6 2.1059 else 2.1060 ac_check_lib_save_LIBS=$LIBS 2.1061 @@ -4546,7 +4559,7 @@ 2.1062 fi 2.1063 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 2.1064 $as_echo "$ac_cv_lib_resolv_res_search" >&6; } 2.1065 -if test "x$ac_cv_lib_resolv_res_search" = x""yes; then : 2.1066 +if test "x$ac_cv_lib_resolv_res_search" = xyes; then : 2.1067 has_resolv=yes; RESOLV_LIBS="-lresolv" 2.1068 else 2.1069 has_resolv=no 2.1070 @@ -4580,7 +4593,7 @@ 2.1071 LIBS="$saved_LIBS" 2.1072 fi 2.1073 if test "$has_resolv" = no; then 2.1074 - as_fn_error "\"no libresolv\"" "$LINENO" 5 2.1075 + as_fn_error $? "\"no libresolv\"" "$LINENO" 5 2.1076 RESOLV_LIBS='' 2.1077 fi 2.1078 fi 2.1079 @@ -4592,7 +4605,7 @@ 2.1080 for ac_func in getline 2.1081 do : 2.1082 ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" 2.1083 -if test "x$ac_cv_func_getline" = x""yes; then : 2.1084 +if test "x$ac_cv_func_getline" = xyes; then : 2.1085 cat >>confdefs.h <<_ACEOF 2.1086 #define HAVE_GETLINE 1 2.1087 _ACEOF 2.1088 @@ -4604,7 +4617,7 @@ 2.1089 for ac_func in fdatasync 2.1090 do : 2.1091 ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync" 2.1092 -if test "x$ac_cv_func_fdatasync" = x""yes; then : 2.1093 +if test "x$ac_cv_func_fdatasync" = xyes; then : 2.1094 cat >>confdefs.h <<_ACEOF 2.1095 #define HAVE_FDATASYNC 1 2.1096 _ACEOF 2.1097 @@ -4615,7 +4628,7 @@ 2.1098 2.1099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 2.1100 $as_echo_n "checking for ANSI C header files... " >&6; } 2.1101 -if test "${ac_cv_header_stdc+set}" = set; then : 2.1102 +if ${ac_cv_header_stdc+:} false; then : 2.1103 $as_echo_n "(cached) " >&6 2.1104 else 2.1105 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1106 @@ -4732,8 +4745,7 @@ 2.1107 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 2.1108 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 2.1109 " 2.1110 -eval as_val=\$$as_ac_Header 2.1111 - if test "x$as_val" = x""yes; then : 2.1112 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 2.1113 cat >>confdefs.h <<_ACEOF 2.1114 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 2.1115 _ACEOF 2.1116 @@ -4747,8 +4759,7 @@ 2.1117 do : 2.1118 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 2.1119 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 2.1120 -eval as_val=\$$as_ac_Header 2.1121 - if test "x$as_val" = x""yes; then : 2.1122 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 2.1123 cat >>confdefs.h <<_ACEOF 2.1124 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 2.1125 _ACEOF 2.1126 @@ -4760,7 +4771,7 @@ 2.1127 2.1128 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 2.1129 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } 2.1130 -if test "${ac_cv_c_const+set}" = set; then : 2.1131 +if ${ac_cv_c_const+:} false; then : 2.1132 $as_echo_n "(cached) " >&6 2.1133 else 2.1134 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1135 @@ -4839,7 +4850,7 @@ 2.1136 fi 2.1137 2.1138 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" 2.1139 -if test "x$ac_cv_type_pid_t" = x""yes; then : 2.1140 +if test "x$ac_cv_type_pid_t" = xyes; then : 2.1141 2.1142 else 2.1143 2.1144 @@ -4850,7 +4861,7 @@ 2.1145 fi 2.1146 2.1147 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" 2.1148 -if test "x$ac_cv_type_size_t" = x""yes; then : 2.1149 +if test "x$ac_cv_type_size_t" = xyes; then : 2.1150 2.1151 else 2.1152 2.1153 @@ -4862,7 +4873,7 @@ 2.1154 2.1155 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 2.1156 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } 2.1157 -if test "${ac_cv_header_time+set}" = set; then : 2.1158 +if ${ac_cv_header_time+:} false; then : 2.1159 $as_echo_n "(cached) " >&6 2.1160 else 2.1161 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1162 @@ -4897,7 +4908,7 @@ 2.1163 2.1164 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 2.1165 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } 2.1166 -if test "${ac_cv_struct_tm+set}" = set; then : 2.1167 +if ${ac_cv_struct_tm+:} false; then : 2.1168 $as_echo_n "(cached) " >&6 2.1169 else 2.1170 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1171 @@ -4933,7 +4944,7 @@ 2.1172 2.1173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5 2.1174 $as_echo_n "checking for working POSIX fnmatch... " >&6; } 2.1175 -if test "${ac_cv_func_fnmatch_works+set}" = set; then : 2.1176 +if ${ac_cv_func_fnmatch_works+:} false; then : 2.1177 $as_echo_n "(cached) " >&6 2.1178 else 2.1179 # Some versions of Solaris, SCO, and the GNU C Library 2.1180 @@ -4985,7 +4996,7 @@ 2.1181 2.1182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 2.1183 $as_echo_n "checking return type of signal handlers... " >&6; } 2.1184 -if test "${ac_cv_type_signal+set}" = set; then : 2.1185 +if ${ac_cv_type_signal+:} false; then : 2.1186 $as_echo_n "(cached) " >&6 2.1187 else 2.1188 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1189 @@ -5019,7 +5030,7 @@ 2.1190 for ac_func in strftime 2.1191 do : 2.1192 ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" 2.1193 -if test "x$ac_cv_func_strftime" = x""yes; then : 2.1194 +if test "x$ac_cv_func_strftime" = xyes; then : 2.1195 cat >>confdefs.h <<_ACEOF 2.1196 #define HAVE_STRFTIME 1 2.1197 _ACEOF 2.1198 @@ -5028,7 +5039,7 @@ 2.1199 # strftime is in -lintl on SCO UNIX. 2.1200 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 2.1201 $as_echo_n "checking for strftime in -lintl... " >&6; } 2.1202 -if test "${ac_cv_lib_intl_strftime+set}" = set; then : 2.1203 +if ${ac_cv_lib_intl_strftime+:} false; then : 2.1204 $as_echo_n "(cached) " >&6 2.1205 else 2.1206 ac_check_lib_save_LIBS=$LIBS 2.1207 @@ -5062,7 +5073,7 @@ 2.1208 fi 2.1209 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 2.1210 $as_echo "$ac_cv_lib_intl_strftime" >&6; } 2.1211 -if test "x$ac_cv_lib_intl_strftime" = x""yes; then : 2.1212 +if test "x$ac_cv_lib_intl_strftime" = xyes; then : 2.1213 $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h 2.1214 2.1215 LIBS="-lintl $LIBS" 2.1216 @@ -5074,13 +5085,13 @@ 2.1217 for ac_func in vprintf 2.1218 do : 2.1219 ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" 2.1220 -if test "x$ac_cv_func_vprintf" = x""yes; then : 2.1221 +if test "x$ac_cv_func_vprintf" = xyes; then : 2.1222 cat >>confdefs.h <<_ACEOF 2.1223 #define HAVE_VPRINTF 1 2.1224 _ACEOF 2.1225 2.1226 ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" 2.1227 -if test "x$ac_cv_func__doprnt" = x""yes; then : 2.1228 +if test "x$ac_cv_func__doprnt" = xyes; then : 2.1229 2.1230 $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h 2.1231 2.1232 @@ -5094,8 +5105,7 @@ 2.1233 do : 2.1234 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 2.1235 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 2.1236 -eval as_val=\$$as_ac_var 2.1237 - if test "x$as_val" = x""yes; then : 2.1238 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 2.1239 cat >>confdefs.h <<_ACEOF 2.1240 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 2.1241 _ACEOF 2.1242 @@ -5243,7 +5253,7 @@ 2.1243 if test "x$with_libcrypto" = "xyes"; then 2.1244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 2.1245 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } 2.1246 -if test "${ac_cv_lib_crypto_MD5+set}" = set; then : 2.1247 +if ${ac_cv_lib_crypto_MD5+:} false; then : 2.1248 $as_echo_n "(cached) " >&6 2.1249 else 2.1250 ac_check_lib_save_LIBS=$LIBS 2.1251 @@ -5277,10 +5287,10 @@ 2.1252 fi 2.1253 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5 2.1254 $as_echo "$ac_cv_lib_crypto_MD5" >&6; } 2.1255 -if test "x$ac_cv_lib_crypto_MD5" = x""yes; then : 2.1256 +if test "x$ac_cv_lib_crypto_MD5" = xyes; then : 2.1257 has_crypto='yes' 2.1258 else 2.1259 - as_fn_error "'no libcrypto'" "$LINENO" 5 2.1260 + as_fn_error $? "'no libcrypto'" "$LINENO" 5 2.1261 fi 2.1262 2.1263 if test "x$has_crypto" = 'xyes'; then 2.1264 @@ -5310,7 +5320,7 @@ 2.1265 2.1266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ident_id in -lident" >&5 2.1267 $as_echo_n "checking for ident_id in -lident... " >&6; } 2.1268 -if test "${ac_cv_lib_ident_ident_id+set}" = set; then : 2.1269 +if ${ac_cv_lib_ident_ident_id+:} false; then : 2.1270 $as_echo_n "(cached) " >&6 2.1271 else 2.1272 ac_check_lib_save_LIBS=$LIBS 2.1273 @@ -5344,7 +5354,7 @@ 2.1274 fi 2.1275 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ident_ident_id" >&5 2.1276 $as_echo "$ac_cv_lib_ident_ident_id" >&6; } 2.1277 -if test "x$ac_cv_lib_ident_ident_id" = x""yes; then : 2.1278 +if test "x$ac_cv_lib_ident_ident_id" = xyes; then : 2.1279 IDENT_LIBS='-lident' 2.1280 else 2.1281 IDENT_LIBS='libident/libident.a' 2.1282 @@ -5381,7 +5391,7 @@ 2.1283 if test "x$with_liblockfile" = xyes; then 2.1284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5 2.1285 $as_echo_n "checking for maillock in -llockfile... " >&6; } 2.1286 -if test "${ac_cv_lib_lockfile_maillock+set}" = set; then : 2.1287 +if ${ac_cv_lib_lockfile_maillock+:} false; then : 2.1288 $as_echo_n "(cached) " >&6 2.1289 else 2.1290 ac_check_lib_save_LIBS=$LIBS 2.1291 @@ -5415,10 +5425,10 @@ 2.1292 fi 2.1293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5 2.1294 $as_echo "$ac_cv_lib_lockfile_maillock" >&6; } 2.1295 -if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then : 2.1296 +if test "x$ac_cv_lib_lockfile_maillock" = xyes; then : 2.1297 has_lockfile=yes 2.1298 else 2.1299 - as_fn_error "\"no liblockfile\"" "$LINENO" 5 2.1300 + as_fn_error $? "\"no liblockfile\"" "$LINENO" 5 2.1301 fi 2.1302 2.1303 LOCKFILE_LIBS='-llockfile' 2.1304 @@ -5563,10 +5573,21 @@ 2.1305 :end' >>confcache 2.1306 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 2.1307 if test -w "$cache_file"; then 2.1308 - test "x$cache_file" != "x/dev/null" && 2.1309 + if test "x$cache_file" != "x/dev/null"; then 2.1310 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 2.1311 $as_echo "$as_me: updating cache $cache_file" >&6;} 2.1312 - cat confcache >$cache_file 2.1313 + if test ! -f "$cache_file" || test -h "$cache_file"; then 2.1314 + cat confcache >"$cache_file" 2.1315 + else 2.1316 + case $cache_file in #( 2.1317 + */* | ?:*) 2.1318 + mv -f confcache "$cache_file"$$ && 2.1319 + mv -f "$cache_file"$$ "$cache_file" ;; #( 2.1320 + *) 2.1321 + mv -f confcache "$cache_file" ;; 2.1322 + esac 2.1323 + fi 2.1324 + fi 2.1325 else 2.1326 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 2.1327 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 2.1328 @@ -5582,6 +5603,7 @@ 2.1329 2.1330 ac_libobjs= 2.1331 ac_ltlibobjs= 2.1332 +U= 2.1333 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 2.1334 # 1. Remove the extension, and $U if already installed. 2.1335 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 2.1336 @@ -5605,15 +5627,15 @@ 2.1337 fi 2.1338 2.1339 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 2.1340 - as_fn_error "conditional \"AMDEP\" was never defined. 2.1341 + as_fn_error $? "conditional \"AMDEP\" was never defined. 2.1342 Usually this means the macro was only invoked conditionally." "$LINENO" 5 2.1343 fi 2.1344 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 2.1345 - as_fn_error "conditional \"am__fastdepCC\" was never defined. 2.1346 + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 2.1347 Usually this means the macro was only invoked conditionally." "$LINENO" 5 2.1348 fi 2.1349 2.1350 -: ${CONFIG_STATUS=./config.status} 2.1351 +: "${CONFIG_STATUS=./config.status}" 2.1352 ac_write_fail=0 2.1353 ac_clean_files_save=$ac_clean_files 2.1354 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 2.1355 @@ -5714,6 +5736,7 @@ 2.1356 IFS=" "" $as_nl" 2.1357 2.1358 # Find who we are. Look in the path if we contain no directory separator. 2.1359 +as_myself= 2.1360 case $0 in #(( 2.1361 *[\\/]* ) as_myself=$0 ;; 2.1362 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.1363 @@ -5759,19 +5782,19 @@ 2.1364 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 2.1365 2.1366 2.1367 -# as_fn_error ERROR [LINENO LOG_FD] 2.1368 -# --------------------------------- 2.1369 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 2.1370 +# ---------------------------------------- 2.1371 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 2.1372 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 2.1373 -# script with status $?, using 1 if that was 0. 2.1374 +# script with STATUS, using 1 if that was 0. 2.1375 as_fn_error () 2.1376 { 2.1377 - as_status=$?; test $as_status -eq 0 && as_status=1 2.1378 - if test "$3"; then 2.1379 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.1380 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 2.1381 + as_status=$1; test $as_status -eq 0 && as_status=1 2.1382 + if test "$4"; then 2.1383 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.1384 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 2.1385 fi 2.1386 - $as_echo "$as_me: error: $1" >&2 2.1387 + $as_echo "$as_me: error: $2" >&2 2.1388 as_fn_exit $as_status 2.1389 } # as_fn_error 2.1390 2.1391 @@ -5967,7 +5990,7 @@ 2.1392 test -d "$as_dir" && break 2.1393 done 2.1394 test -z "$as_dirs" || eval "mkdir $as_dirs" 2.1395 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 2.1396 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 2.1397 2.1398 2.1399 } # as_fn_mkdir_p 2.1400 @@ -6020,8 +6043,8 @@ 2.1401 # report actual input values of CONFIG_FILES etc. instead of their 2.1402 # values after options handling. 2.1403 ac_log=" 2.1404 -This file was extended by masqmail $as_me 0.2.30-dev, which was 2.1405 -generated by GNU Autoconf 2.65. Invocation command line was 2.1406 +This file was extended by masqmail $as_me 0.2.30, which was 2.1407 +generated by GNU Autoconf 2.68. Invocation command line was 2.1408 2.1409 CONFIG_FILES = $CONFIG_FILES 2.1410 CONFIG_HEADERS = $CONFIG_HEADERS 2.1411 @@ -6086,11 +6109,11 @@ 2.1412 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.1413 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 2.1414 ac_cs_version="\\ 2.1415 -masqmail config.status 0.2.30-dev 2.1416 -configured by $0, generated by GNU Autoconf 2.65, 2.1417 +masqmail config.status 0.2.30 2.1418 +configured by $0, generated by GNU Autoconf 2.68, 2.1419 with options \\"\$ac_cs_config\\" 2.1420 2.1421 -Copyright (C) 2009 Free Software Foundation, Inc. 2.1422 +Copyright (C) 2010 Free Software Foundation, Inc. 2.1423 This config.status script is free software; the Free Software Foundation 2.1424 gives unlimited permission to copy, distribute and modify it." 2.1425 2.1426 @@ -6108,11 +6131,16 @@ 2.1427 while test $# != 0 2.1428 do 2.1429 case $1 in 2.1430 - --*=*) 2.1431 + --*=?*) 2.1432 ac_option=`expr "X$1" : 'X\([^=]*\)='` 2.1433 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 2.1434 ac_shift=: 2.1435 ;; 2.1436 + --*=) 2.1437 + ac_option=`expr "X$1" : 'X\([^=]*\)='` 2.1438 + ac_optarg= 2.1439 + ac_shift=: 2.1440 + ;; 2.1441 *) 2.1442 ac_option=$1 2.1443 ac_optarg=$2 2.1444 @@ -6134,6 +6162,7 @@ 2.1445 $ac_shift 2.1446 case $ac_optarg in 2.1447 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 2.1448 + '') as_fn_error $? "missing file argument" ;; 2.1449 esac 2.1450 as_fn_append CONFIG_FILES " '$ac_optarg'" 2.1451 ac_need_defaults=false;; 2.1452 @@ -6146,7 +6175,7 @@ 2.1453 ac_need_defaults=false;; 2.1454 --he | --h) 2.1455 # Conflict between --help and --header 2.1456 - as_fn_error "ambiguous option: \`$1' 2.1457 + as_fn_error $? "ambiguous option: \`$1' 2.1458 Try \`$0 --help' for more information.";; 2.1459 --help | --hel | -h ) 2.1460 $as_echo "$ac_cs_usage"; exit ;; 2.1461 @@ -6155,7 +6184,7 @@ 2.1462 ac_cs_silent=: ;; 2.1463 2.1464 # This is an error. 2.1465 - -*) as_fn_error "unrecognized option: \`$1' 2.1466 + -*) as_fn_error $? "unrecognized option: \`$1' 2.1467 Try \`$0 --help' for more information." ;; 2.1468 2.1469 *) as_fn_append ac_config_targets " $1" 2.1470 @@ -6218,7 +6247,7 @@ 2.1471 "src/libident/Makefile") CONFIG_FILES="$CONFIG_FILES src/libident/Makefile" ;; 2.1472 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; 2.1473 2.1474 - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 2.1475 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 2.1476 esac 2.1477 done 2.1478 2.1479 @@ -6241,9 +6270,10 @@ 2.1480 # after its creation but before its name has been assigned to `$tmp'. 2.1481 $debug || 2.1482 { 2.1483 - tmp= 2.1484 + tmp= ac_tmp= 2.1485 trap 'exit_status=$? 2.1486 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 2.1487 + : "${ac_tmp:=$tmp}" 2.1488 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 2.1489 ' 0 2.1490 trap 'as_fn_exit 1' 1 2 13 15 2.1491 } 2.1492 @@ -6251,12 +6281,13 @@ 2.1493 2.1494 { 2.1495 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 2.1496 - test -n "$tmp" && test -d "$tmp" 2.1497 + test -d "$tmp" 2.1498 } || 2.1499 { 2.1500 tmp=./conf$$-$RANDOM 2.1501 (umask 077 && mkdir "$tmp") 2.1502 -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 2.1503 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 2.1504 +ac_tmp=$tmp 2.1505 2.1506 # Set up the scripts for CONFIG_FILES section. 2.1507 # No need to generate them if there are no CONFIG_FILES. 2.1508 @@ -6273,12 +6304,12 @@ 2.1509 fi 2.1510 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 2.1511 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 2.1512 - ac_cs_awk_cr='\r' 2.1513 + ac_cs_awk_cr='\\r' 2.1514 else 2.1515 ac_cs_awk_cr=$ac_cr 2.1516 fi 2.1517 2.1518 -echo 'BEGIN {' >"$tmp/subs1.awk" && 2.1519 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 2.1520 _ACEOF 2.1521 2.1522 2.1523 @@ -6287,18 +6318,18 @@ 2.1524 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 2.1525 echo "_ACEOF" 2.1526 } >conf$$subs.sh || 2.1527 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.1528 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 2.1529 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.1530 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 2.1531 ac_delim='%!_!# ' 2.1532 for ac_last_try in false false false false false :; do 2.1533 . ./conf$$subs.sh || 2.1534 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.1535 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.1536 2.1537 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 2.1538 if test $ac_delim_n = $ac_delim_num; then 2.1539 break 2.1540 elif $ac_last_try; then 2.1541 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.1542 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.1543 else 2.1544 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 2.1545 fi 2.1546 @@ -6306,7 +6337,7 @@ 2.1547 rm -f conf$$subs.sh 2.1548 2.1549 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.1550 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 2.1551 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 2.1552 _ACEOF 2.1553 sed -n ' 2.1554 h 2.1555 @@ -6354,7 +6385,7 @@ 2.1556 rm -f conf$$subs.awk 2.1557 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.1558 _ACAWK 2.1559 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 2.1560 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 2.1561 for (key in S) S_is_set[key] = 1 2.1562 FS = "" 2.1563 2.1564 @@ -6386,21 +6417,29 @@ 2.1565 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 2.1566 else 2.1567 cat 2.1568 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 2.1569 - || as_fn_error "could not setup config files machinery" "$LINENO" 5 2.1570 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 2.1571 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 2.1572 _ACEOF 2.1573 2.1574 -# VPATH may cause trouble with some makes, so we remove $(srcdir), 2.1575 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 2.1576 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 2.1577 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 2.1578 # trailing colons and then remove the whole line if VPATH becomes empty 2.1579 # (actually we leave an empty line to preserve line numbers). 2.1580 if test "x$srcdir" = x.; then 2.1581 - ac_vpsub='/^[ ]*VPATH[ ]*=/{ 2.1582 -s/:*\$(srcdir):*/:/ 2.1583 -s/:*\${srcdir}:*/:/ 2.1584 -s/:*@srcdir@:*/:/ 2.1585 -s/^\([^=]*=[ ]*\):*/\1/ 2.1586 + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 2.1587 +h 2.1588 +s/// 2.1589 +s/^/:/ 2.1590 +s/[ ]*$/:/ 2.1591 +s/:\$(srcdir):/:/g 2.1592 +s/:\${srcdir}:/:/g 2.1593 +s/:@srcdir@:/:/g 2.1594 +s/^:*// 2.1595 s/:*$// 2.1596 +x 2.1597 +s/\(=[ ]*\).*/\1/ 2.1598 +G 2.1599 +s/\n// 2.1600 s/^[^=]*=[ ]*$// 2.1601 }' 2.1602 fi 2.1603 @@ -6412,7 +6451,7 @@ 2.1604 # No need to generate them if there are no CONFIG_HEADERS. 2.1605 # This happens for instance with `./config.status Makefile'. 2.1606 if test -n "$CONFIG_HEADERS"; then 2.1607 -cat >"$tmp/defines.awk" <<\_ACAWK || 2.1608 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 2.1609 BEGIN { 2.1610 _ACEOF 2.1611 2.1612 @@ -6424,11 +6463,11 @@ 2.1613 # handling of long lines. 2.1614 ac_delim='%!_!# ' 2.1615 for ac_last_try in false false :; do 2.1616 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 2.1617 - if test -z "$ac_t"; then 2.1618 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 2.1619 + if test -z "$ac_tt"; then 2.1620 break 2.1621 elif $ac_last_try; then 2.1622 - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 2.1623 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 2.1624 else 2.1625 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 2.1626 fi 2.1627 @@ -6513,7 +6552,7 @@ 2.1628 _ACAWK 2.1629 _ACEOF 2.1630 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 2.1631 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 2.1632 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 2.1633 fi # test -n "$CONFIG_HEADERS" 2.1634 2.1635 2.1636 @@ -6526,7 +6565,7 @@ 2.1637 esac 2.1638 case $ac_mode$ac_tag in 2.1639 :[FHL]*:*);; 2.1640 - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 2.1641 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 2.1642 :[FH]-) ac_tag=-:-;; 2.1643 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 2.1644 esac 2.1645 @@ -6545,7 +6584,7 @@ 2.1646 for ac_f 2.1647 do 2.1648 case $ac_f in 2.1649 - -) ac_f="$tmp/stdin";; 2.1650 + -) ac_f="$ac_tmp/stdin";; 2.1651 *) # Look for the file first in the build tree, then in the source tree 2.1652 # (if the path is not absolute). The absolute path cannot be DOS-style, 2.1653 # because $ac_f cannot contain `:'. 2.1654 @@ -6554,7 +6593,7 @@ 2.1655 [\\/$]*) false;; 2.1656 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 2.1657 esac || 2.1658 - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 2.1659 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 2.1660 esac 2.1661 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 2.1662 as_fn_append ac_file_inputs " '$ac_f'" 2.1663 @@ -6580,8 +6619,8 @@ 2.1664 esac 2.1665 2.1666 case $ac_tag in 2.1667 - *:-:* | *:-) cat >"$tmp/stdin" \ 2.1668 - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 2.1669 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 2.1670 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 2.1671 esac 2.1672 ;; 2.1673 esac 2.1674 @@ -6717,23 +6756,24 @@ 2.1675 s&@MKDIR_P@&$ac_MKDIR_P&;t t 2.1676 $ac_datarootdir_hack 2.1677 " 2.1678 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 2.1679 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1680 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 2.1681 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1682 2.1683 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 2.1684 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 2.1685 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 2.1686 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 2.1687 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 2.1688 + "$ac_tmp/out"`; test -z "$ac_out"; } && 2.1689 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.1690 -which seems to be undefined. Please make sure it is defined." >&5 2.1691 +which seems to be undefined. Please make sure it is defined" >&5 2.1692 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.1693 -which seems to be undefined. Please make sure it is defined." >&2;} 2.1694 - 2.1695 - rm -f "$tmp/stdin" 2.1696 +which seems to be undefined. Please make sure it is defined" >&2;} 2.1697 + 2.1698 + rm -f "$ac_tmp/stdin" 2.1699 case $ac_file in 2.1700 - -) cat "$tmp/out" && rm -f "$tmp/out";; 2.1701 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 2.1702 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 2.1703 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 2.1704 esac \ 2.1705 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1706 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1707 ;; 2.1708 :H) 2.1709 # 2.1710 @@ -6742,21 +6782,21 @@ 2.1711 if test x"$ac_file" != x-; then 2.1712 { 2.1713 $as_echo "/* $configure_input */" \ 2.1714 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 2.1715 - } >"$tmp/config.h" \ 2.1716 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1717 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 2.1718 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 2.1719 + } >"$ac_tmp/config.h" \ 2.1720 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1721 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 2.1722 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 2.1723 $as_echo "$as_me: $ac_file is unchanged" >&6;} 2.1724 else 2.1725 rm -f "$ac_file" 2.1726 - mv "$tmp/config.h" "$ac_file" \ 2.1727 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1728 + mv "$ac_tmp/config.h" "$ac_file" \ 2.1729 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1730 fi 2.1731 else 2.1732 $as_echo "/* $configure_input */" \ 2.1733 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 2.1734 - || as_fn_error "could not create -" "$LINENO" 5 2.1735 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 2.1736 + || as_fn_error $? "could not create -" "$LINENO" 5 2.1737 fi 2.1738 # Compute "$ac_file"'s index in $config_headers. 2.1739 _am_arg="$ac_file" 2.1740 @@ -6906,7 +6946,7 @@ 2.1741 ac_clean_files=$ac_clean_files_save 2.1742 2.1743 test $ac_write_fail = 0 || 2.1744 - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 2.1745 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 2.1746 2.1747 2.1748 # configure is writing to config.log, and then calls config.status. 2.1749 @@ -6927,7 +6967,7 @@ 2.1750 exec 5>>config.log 2.1751 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 2.1752 # would make configure fail if this is the last instruction. 2.1753 - $ac_cs_success || as_fn_exit $? 2.1754 + $ac_cs_success || as_fn_exit 1 2.1755 fi 2.1756 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 2.1757 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
3.1 --- a/configure.ac Sat Aug 27 18:16:18 2011 +0200 3.2 +++ b/configure.ac Sat Aug 27 18:20:14 2011 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 dnl Process this file with autoconf to produce a configure script. 3.5 3.6 AC_PREREQ(2.59) 3.7 -AC_INIT(masqmail, 0.2.30-dev, meillo@marmaro.de) 3.8 +AC_INIT(masqmail, 0.2.30, meillo@marmaro.de) 3.9 AC_CONFIG_SRCDIR([src/masqmail.c]) 3.10 AM_CONFIG_HEADER(config.h) 3.11 AM_INIT_AUTOMAKE()