masqmail
diff configure @ 296:e3e1a030c703
ran aclocal and autoconf
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Thu, 09 Dec 2010 10:58:40 -0300 |
| parents | 5eb5a92f3247 |
| children | 45a64a875162 |
line diff
1.1 --- a/configure Thu Dec 09 10:57:40 2010 -0300 1.2 +++ b/configure Thu Dec 09 10:58:40 2010 -0300 1.3 @@ -1,13 +1,13 @@ 1.4 #! /bin/sh 1.5 # Guess values for system-dependent variables and create Makefiles. 1.6 -# Generated by GNU Autoconf 2.65 for masqmail 0.3.1. 1.7 +# Generated by GNU Autoconf 2.67 for masqmail 0.3.2-dev. 1.8 # 1.9 # Report bugs to <meillo@marmaro.de>. 1.10 # 1.11 # 1.12 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 1.13 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 1.14 -# Inc. 1.15 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 1.16 +# Foundation, Inc. 1.17 # 1.18 # 1.19 # This configure script is free software; the Free Software Foundation 1.20 @@ -319,7 +319,7 @@ 1.21 test -d "$as_dir" && break 1.22 done 1.23 test -z "$as_dirs" || eval "mkdir $as_dirs" 1.24 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 1.25 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 1.26 1.27 1.28 } # as_fn_mkdir_p 1.29 @@ -359,19 +359,19 @@ 1.30 fi # as_fn_arith 1.31 1.32 1.33 -# as_fn_error ERROR [LINENO LOG_FD] 1.34 -# --------------------------------- 1.35 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 1.36 +# ---------------------------------------- 1.37 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 1.38 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 1.39 -# script with status $?, using 1 if that was 0. 1.40 +# script with STATUS, using 1 if that was 0. 1.41 as_fn_error () 1.42 { 1.43 - as_status=$?; test $as_status -eq 0 && as_status=1 1.44 - if test "$3"; then 1.45 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.46 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 1.47 + as_status=$1; test $as_status -eq 0 && as_status=1 1.48 + if test "$4"; then 1.49 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.50 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 1.51 fi 1.52 - $as_echo "$as_me: error: $1" >&2 1.53 + $as_echo "$as_me: error: $2" >&2 1.54 as_fn_exit $as_status 1.55 } # as_fn_error 1.56 1.57 @@ -533,7 +533,7 @@ 1.58 exec 6>&1 1.59 1.60 # Name of the host. 1.61 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 1.62 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 1.63 # so uname gets run too. 1.64 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 1.65 1.66 @@ -552,8 +552,8 @@ 1.67 # Identity of this package. 1.68 PACKAGE_NAME='masqmail' 1.69 PACKAGE_TARNAME='masqmail' 1.70 -PACKAGE_VERSION='0.3.1' 1.71 -PACKAGE_STRING='masqmail 0.3.1' 1.72 +PACKAGE_VERSION='0.3.2-dev' 1.73 +PACKAGE_STRING='masqmail 0.3.2-dev' 1.74 PACKAGE_BUGREPORT='meillo@marmaro.de' 1.75 PACKAGE_URL='' 1.76 1.77 @@ -788,8 +788,9 @@ 1.78 fi 1.79 1.80 case $ac_option in 1.81 - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1.82 - *) ac_optarg=yes ;; 1.83 + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1.84 + *=) ac_optarg= ;; 1.85 + *) ac_optarg=yes ;; 1.86 esac 1.87 1.88 # Accept the important Cygnus configure options, so we can diagnose typos. 1.89 @@ -834,7 +835,7 @@ 1.90 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1.91 # Reject names that are not valid shell variable names. 1.92 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1.93 - as_fn_error "invalid feature name: $ac_useropt" 1.94 + as_fn_error $? "invalid feature name: $ac_useropt" 1.95 ac_useropt_orig=$ac_useropt 1.96 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1.97 case $ac_user_opts in 1.98 @@ -860,7 +861,7 @@ 1.99 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1.100 # Reject names that are not valid shell variable names. 1.101 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1.102 - as_fn_error "invalid feature name: $ac_useropt" 1.103 + as_fn_error $? "invalid feature name: $ac_useropt" 1.104 ac_useropt_orig=$ac_useropt 1.105 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1.106 case $ac_user_opts in 1.107 @@ -1064,7 +1065,7 @@ 1.108 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1.109 # Reject names that are not valid shell variable names. 1.110 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1.111 - as_fn_error "invalid package name: $ac_useropt" 1.112 + as_fn_error $? "invalid package name: $ac_useropt" 1.113 ac_useropt_orig=$ac_useropt 1.114 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1.115 case $ac_user_opts in 1.116 @@ -1080,7 +1081,7 @@ 1.117 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1.118 # Reject names that are not valid shell variable names. 1.119 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1.120 - as_fn_error "invalid package name: $ac_useropt" 1.121 + as_fn_error $? "invalid package name: $ac_useropt" 1.122 ac_useropt_orig=$ac_useropt 1.123 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1.124 case $ac_user_opts in 1.125 @@ -1110,8 +1111,8 @@ 1.126 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1.127 x_libraries=$ac_optarg ;; 1.128 1.129 - -*) as_fn_error "unrecognized option: \`$ac_option' 1.130 -Try \`$0 --help' for more information." 1.131 + -*) as_fn_error $? "unrecognized option: \`$ac_option' 1.132 +Try \`$0 --help' for more information" 1.133 ;; 1.134 1.135 *=*) 1.136 @@ -1119,7 +1120,7 @@ 1.137 # Reject names that are not valid shell variable names. 1.138 case $ac_envvar in #( 1.139 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1.140 - as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1.141 + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 1.142 esac 1.143 eval $ac_envvar=\$ac_optarg 1.144 export $ac_envvar ;; 1.145 @@ -1137,13 +1138,13 @@ 1.146 1.147 if test -n "$ac_prev"; then 1.148 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1.149 - as_fn_error "missing argument to $ac_option" 1.150 + as_fn_error $? "missing argument to $ac_option" 1.151 fi 1.152 1.153 if test -n "$ac_unrecognized_opts"; then 1.154 case $enable_option_checking in 1.155 no) ;; 1.156 - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1.157 + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 1.158 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1.159 esac 1.160 fi 1.161 @@ -1166,7 +1167,7 @@ 1.162 [\\/$]* | ?:[\\/]* ) continue;; 1.163 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1.164 esac 1.165 - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1.166 + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 1.167 done 1.168 1.169 # There might be people who depend on the old broken behavior: `$host' 1.170 @@ -1180,8 +1181,8 @@ 1.171 if test "x$host_alias" != x; then 1.172 if test "x$build_alias" = x; then 1.173 cross_compiling=maybe 1.174 - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1.175 - If a cross compiler is detected then cross compile mode will be used." >&2 1.176 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 1.177 + If a cross compiler is detected then cross compile mode will be used" >&2 1.178 elif test "x$build_alias" != "x$host_alias"; then 1.179 cross_compiling=yes 1.180 fi 1.181 @@ -1196,9 +1197,9 @@ 1.182 ac_pwd=`pwd` && test -n "$ac_pwd" && 1.183 ac_ls_di=`ls -di .` && 1.184 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1.185 - as_fn_error "working directory cannot be determined" 1.186 + as_fn_error $? "working directory cannot be determined" 1.187 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1.188 - as_fn_error "pwd does not report name of working directory" 1.189 + as_fn_error $? "pwd does not report name of working directory" 1.190 1.191 1.192 # Find the source files, if location was not specified. 1.193 @@ -1237,11 +1238,11 @@ 1.194 fi 1.195 if test ! -r "$srcdir/$ac_unique_file"; then 1.196 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1.197 - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1.198 + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 1.199 fi 1.200 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1.201 ac_abs_confdir=`( 1.202 - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1.203 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 1.204 pwd)` 1.205 # When building in place, set srcdir=. 1.206 if test "$ac_abs_confdir" = "$ac_pwd"; then 1.207 @@ -1267,7 +1268,7 @@ 1.208 # Omit some internal or obsolete options to make the list less imposing. 1.209 # This message is too long to be a string in the A/UX 3.1 sh. 1.210 cat <<_ACEOF 1.211 -\`configure' configures masqmail 0.3.1 to adapt to many kinds of systems. 1.212 +\`configure' configures masqmail 0.3.2-dev to adapt to many kinds of systems. 1.213 1.214 Usage: $0 [OPTION]... [VAR=VALUE]... 1.215 1.216 @@ -1281,7 +1282,7 @@ 1.217 --help=short display options specific to this package 1.218 --help=recursive display the short help of all the included packages 1.219 -V, --version display version information and exit 1.220 - -q, --quiet, --silent do not print \`checking...' messages 1.221 + -q, --quiet, --silent do not print \`checking ...' messages 1.222 --cache-file=FILE cache test results in FILE [disabled] 1.223 -C, --config-cache alias for \`--cache-file=config.cache' 1.224 -n, --no-create do not create output files 1.225 @@ -1333,7 +1334,7 @@ 1.226 1.227 if test -n "$ac_init_help"; then 1.228 case $ac_init_help in 1.229 - short | recursive ) echo "Configuration of masqmail 0.3.1:";; 1.230 + short | recursive ) echo "Configuration of masqmail 0.3.2-dev:";; 1.231 esac 1.232 cat <<\_ACEOF 1.233 1.234 @@ -1442,10 +1443,10 @@ 1.235 test -n "$ac_init_help" && exit $ac_status 1.236 if $ac_init_version; then 1.237 cat <<\_ACEOF 1.238 -masqmail configure 0.3.1 1.239 -generated by GNU Autoconf 2.65 1.240 - 1.241 -Copyright (C) 2009 Free Software Foundation, Inc. 1.242 +masqmail configure 0.3.2-dev 1.243 +generated by GNU Autoconf 2.67 1.244 + 1.245 +Copyright (C) 2010 Free Software Foundation, Inc. 1.246 This configure script is free software; the Free Software Foundation 1.247 gives unlimited permission to copy, distribute and modify it. 1.248 _ACEOF 1.249 @@ -1561,7 +1562,7 @@ 1.250 mv -f conftest.er1 conftest.err 1.251 fi 1.252 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1.253 - test $ac_status = 0; } >/dev/null && { 1.254 + test $ac_status = 0; } > conftest.i && { 1.255 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1.256 test ! -s conftest.err 1.257 }; then : 1.258 @@ -1627,7 +1628,7 @@ 1.259 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.261 $as_echo_n "checking for $2... " >&6; } 1.262 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.263 +if eval "test \"\${$3+set}\"" = set; then : 1.264 $as_echo_n "(cached) " >&6 1.265 else 1.266 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.267 @@ -1694,10 +1695,10 @@ 1.268 ac_fn_c_check_header_mongrel () 1.269 { 1.270 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.271 - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.272 + if eval "test \"\${$3+set}\"" = set; then : 1.273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.274 $as_echo_n "checking for $2... " >&6; } 1.275 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.276 +if eval "test \"\${$3+set}\"" = set; then : 1.277 $as_echo_n "(cached) " >&6 1.278 fi 1.279 eval ac_res=\$$3 1.280 @@ -1733,7 +1734,7 @@ 1.281 else 1.282 ac_header_preproc=no 1.283 fi 1.284 -rm -f conftest.err conftest.$ac_ext 1.285 +rm -f conftest.err conftest.i conftest.$ac_ext 1.286 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1.287 $as_echo "$ac_header_preproc" >&6; } 1.288 1.289 @@ -1756,17 +1757,15 @@ 1.290 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 1.291 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 1.292 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 1.293 -( cat <<\_ASBOX 1.294 -## -------------------------------- ## 1.295 +( $as_echo "## -------------------------------- ## 1.296 ## Report this to meillo@marmaro.de ## 1.297 -## -------------------------------- ## 1.298 -_ASBOX 1.299 +## -------------------------------- ##" 1.300 ) | sed "s/^/$as_me: WARNING: /" >&2 1.301 ;; 1.302 esac 1.303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.304 $as_echo_n "checking for $2... " >&6; } 1.305 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.306 +if eval "test \"\${$3+set}\"" = set; then : 1.307 $as_echo_n "(cached) " >&6 1.308 else 1.309 eval "$3=\$ac_header_compiler" 1.310 @@ -1788,7 +1787,7 @@ 1.311 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.312 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.313 $as_echo_n "checking for $2... " >&6; } 1.314 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.315 +if eval "test \"\${$3+set}\"" = set; then : 1.316 $as_echo_n "(cached) " >&6 1.317 else 1.318 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.319 @@ -1819,7 +1818,7 @@ 1.320 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.321 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.322 $as_echo_n "checking for $2... " >&6; } 1.323 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1.324 +if eval "test \"\${$3+set}\"" = set; then : 1.325 $as_echo_n "(cached) " >&6 1.326 else 1.327 eval "$3=no" 1.328 @@ -1867,8 +1866,8 @@ 1.329 This file contains any messages produced by compilers while 1.330 running configure, to aid debugging if configure makes a mistake. 1.331 1.332 -It was created by masqmail $as_me 0.3.1, which was 1.333 -generated by GNU Autoconf 2.65. Invocation command line was 1.334 +It was created by masqmail $as_me 0.3.2-dev, which was 1.335 +generated by GNU Autoconf 2.67. Invocation command line was 1.336 1.337 $ $0 $@ 1.338 1.339 @@ -1978,11 +1977,9 @@ 1.340 { 1.341 echo 1.342 1.343 - cat <<\_ASBOX 1.344 -## ---------------- ## 1.345 + $as_echo "## ---------------- ## 1.346 ## Cache variables. ## 1.347 -## ---------------- ## 1.348 -_ASBOX 1.349 +## ---------------- ##" 1.350 echo 1.351 # The following way of writing the cache mishandles newlines in values, 1.352 ( 1.353 @@ -2016,11 +2013,9 @@ 1.354 ) 1.355 echo 1.356 1.357 - cat <<\_ASBOX 1.358 -## ----------------- ## 1.359 + $as_echo "## ----------------- ## 1.360 ## Output variables. ## 1.361 -## ----------------- ## 1.362 -_ASBOX 1.363 +## ----------------- ##" 1.364 echo 1.365 for ac_var in $ac_subst_vars 1.366 do 1.367 @@ -2033,11 +2028,9 @@ 1.368 echo 1.369 1.370 if test -n "$ac_subst_files"; then 1.371 - cat <<\_ASBOX 1.372 -## ------------------- ## 1.373 + $as_echo "## ------------------- ## 1.374 ## File substitutions. ## 1.375 -## ------------------- ## 1.376 -_ASBOX 1.377 +## ------------------- ##" 1.378 echo 1.379 for ac_var in $ac_subst_files 1.380 do 1.381 @@ -2051,11 +2044,9 @@ 1.382 fi 1.383 1.384 if test -s confdefs.h; then 1.385 - cat <<\_ASBOX 1.386 -## ----------- ## 1.387 + $as_echo "## ----------- ## 1.388 ## confdefs.h. ## 1.389 -## ----------- ## 1.390 -_ASBOX 1.391 +## ----------- ##" 1.392 echo 1.393 cat confdefs.h 1.394 echo 1.395 @@ -2110,7 +2101,12 @@ 1.396 ac_site_file1=NONE 1.397 ac_site_file2=NONE 1.398 if test -n "$CONFIG_SITE"; then 1.399 - ac_site_file1=$CONFIG_SITE 1.400 + # We do not want a PATH search for config.site. 1.401 + case $CONFIG_SITE in #(( 1.402 + -*) ac_site_file1=./$CONFIG_SITE;; 1.403 + */*) ac_site_file1=$CONFIG_SITE;; 1.404 + *) ac_site_file1=./$CONFIG_SITE;; 1.405 + esac 1.406 elif test "x$prefix" != xNONE; then 1.407 ac_site_file1=$prefix/share/config.site 1.408 ac_site_file2=$prefix/etc/config.site 1.409 @@ -2125,7 +2121,11 @@ 1.410 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 1.411 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 1.412 sed 's/^/| /' "$ac_site_file" >&5 1.413 - . "$ac_site_file" 1.414 + . "$ac_site_file" \ 1.415 + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.416 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.417 +as_fn_error $? "failed to load site script $ac_site_file 1.418 +See \`config.log' for more details" "$LINENO" 5 ; } 1.419 fi 1.420 done 1.421 1.422 @@ -2201,7 +2201,7 @@ 1.423 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.424 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 1.425 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 1.426 - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 1.427 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 1.428 fi 1.429 ## -------------------- ## 1.430 ## Main body of script. ## 1.431 @@ -2221,16 +2221,22 @@ 1.432 1.433 ac_aux_dir= 1.434 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 1.435 - for ac_t in install-sh install.sh shtool; do 1.436 - if test -f "$ac_dir/$ac_t"; then 1.437 - ac_aux_dir=$ac_dir 1.438 - ac_install_sh="$ac_aux_dir/$ac_t -c" 1.439 - break 2 1.440 - fi 1.441 - done 1.442 + if test -f "$ac_dir/install-sh"; then 1.443 + ac_aux_dir=$ac_dir 1.444 + ac_install_sh="$ac_aux_dir/install-sh -c" 1.445 + break 1.446 + elif test -f "$ac_dir/install.sh"; then 1.447 + ac_aux_dir=$ac_dir 1.448 + ac_install_sh="$ac_aux_dir/install.sh -c" 1.449 + break 1.450 + elif test -f "$ac_dir/shtool"; then 1.451 + ac_aux_dir=$ac_dir 1.452 + ac_install_sh="$ac_aux_dir/shtool install -c" 1.453 + break 1.454 + fi 1.455 done 1.456 if test -z "$ac_aux_dir"; then 1.457 - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 1.458 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 1.459 fi 1.460 1.461 # These three variables are undocumented and unsupported, 1.462 @@ -2346,11 +2352,11 @@ 1.463 ' 1.464 case `pwd` in 1.465 *[\\\"\#\$\&\'\`$am_lf]*) 1.466 - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; 1.467 + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; 1.468 esac 1.469 case $srcdir in 1.470 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 1.471 - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 1.472 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; 1.473 esac 1.474 1.475 # Do `set' in a subshell so we don't clobber the current shell's 1.476 @@ -2372,7 +2378,7 @@ 1.477 # if, for instance, CONFIG_SHELL is bash and it inherits a 1.478 # broken ls alias from the environment. This has actually 1.479 # happened. Such a system could not be considered "sane". 1.480 - as_fn_error "ls -t appears to fail. Make sure there is not a broken 1.481 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 1.482 alias in your environment" "$LINENO" 5 1.483 fi 1.484 1.485 @@ -2382,7 +2388,7 @@ 1.486 # Ok. 1.487 : 1.488 else 1.489 - as_fn_error "newly created file is older than distributed files! 1.490 + as_fn_error $? "newly created file is older than distributed files! 1.491 Check your system clock" "$LINENO" 5 1.492 fi 1.493 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 1.494 @@ -2620,7 +2626,7 @@ 1.495 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 1.496 set x ${MAKE-make} 1.497 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 1.498 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 1.499 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : 1.500 $as_echo_n "(cached) " >&6 1.501 else 1.502 cat >conftest.make <<\_ACEOF 1.503 @@ -2628,7 +2634,7 @@ 1.504 all: 1.505 @echo '@@@%%%=$(MAKE)=@@@%%%' 1.506 _ACEOF 1.507 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 1.508 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 1.509 case `${MAKE-make} -f conftest.make 2>/dev/null` in 1.510 *@@@%%%=?*=@@@%%%*) 1.511 eval ac_cv_prog_make_${ac_make}_set=yes;; 1.512 @@ -2662,7 +2668,7 @@ 1.513 am__isrc=' -I$(srcdir)' 1.514 # test to see if srcdir already configured 1.515 if test -f $srcdir/config.status; then 1.516 - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 1.517 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 1.518 fi 1.519 fi 1.520 1.521 @@ -2678,7 +2684,7 @@ 1.522 1.523 # Define the identity of the package. 1.524 PACKAGE='masqmail' 1.525 - VERSION='0.3.1' 1.526 + VERSION='0.3.2-dev' 1.527 1.528 1.529 cat >>confdefs.h <<_ACEOF 1.530 @@ -3021,8 +3027,8 @@ 1.531 1.532 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.533 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.534 -as_fn_error "no acceptable C compiler found in \$PATH 1.535 -See \`config.log' for more details." "$LINENO" 5; } 1.536 +as_fn_error $? "no acceptable C compiler found in \$PATH 1.537 +See \`config.log' for more details" "$LINENO" 5 ; } 1.538 1.539 # Provide some information about the compiler. 1.540 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 1.541 @@ -3136,9 +3142,8 @@ 1.542 1.543 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.544 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.545 -{ as_fn_set_status 77 1.546 -as_fn_error "C compiler cannot create executables 1.547 -See \`config.log' for more details." "$LINENO" 5; }; } 1.548 +as_fn_error 77 "C compiler cannot create executables 1.549 +See \`config.log' for more details" "$LINENO" 5 ; } 1.550 else 1.551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 1.552 $as_echo "yes" >&6; } 1.553 @@ -3180,8 +3185,8 @@ 1.554 else 1.555 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.556 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.557 -as_fn_error "cannot compute suffix of executables: cannot compile and link 1.558 -See \`config.log' for more details." "$LINENO" 5; } 1.559 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link 1.560 +See \`config.log' for more details" "$LINENO" 5 ; } 1.561 fi 1.562 rm -f conftest conftest$ac_cv_exeext 1.563 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 1.564 @@ -3238,9 +3243,9 @@ 1.565 else 1.566 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.567 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.568 -as_fn_error "cannot run C compiled programs. 1.569 +as_fn_error $? "cannot run C compiled programs. 1.570 If you meant to cross compile, use \`--host'. 1.571 -See \`config.log' for more details." "$LINENO" 5; } 1.572 +See \`config.log' for more details" "$LINENO" 5 ; } 1.573 fi 1.574 fi 1.575 fi 1.576 @@ -3291,8 +3296,8 @@ 1.577 1.578 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.579 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.580 -as_fn_error "cannot compute suffix of object files: cannot compile 1.581 -See \`config.log' for more details." "$LINENO" 5; } 1.582 +as_fn_error $? "cannot compute suffix of object files: cannot compile 1.583 +See \`config.log' for more details" "$LINENO" 5 ; } 1.584 fi 1.585 rm -f conftest.$ac_cv_objext conftest.$ac_ext 1.586 fi 1.587 @@ -3800,7 +3805,7 @@ 1.588 # Broken: fails on valid input. 1.589 continue 1.590 fi 1.591 -rm -f conftest.err conftest.$ac_ext 1.592 +rm -f conftest.err conftest.i conftest.$ac_ext 1.593 1.594 # OK, works on sane cases. Now check whether nonexistent headers 1.595 # can be detected and how. 1.596 @@ -3816,11 +3821,11 @@ 1.597 ac_preproc_ok=: 1.598 break 1.599 fi 1.600 -rm -f conftest.err conftest.$ac_ext 1.601 +rm -f conftest.err conftest.i conftest.$ac_ext 1.602 1.603 done 1.604 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 1.605 -rm -f conftest.err conftest.$ac_ext 1.606 +rm -f conftest.i conftest.err conftest.$ac_ext 1.607 if $ac_preproc_ok; then : 1.608 break 1.609 fi 1.610 @@ -3859,7 +3864,7 @@ 1.611 # Broken: fails on valid input. 1.612 continue 1.613 fi 1.614 -rm -f conftest.err conftest.$ac_ext 1.615 +rm -f conftest.err conftest.i conftest.$ac_ext 1.616 1.617 # OK, works on sane cases. Now check whether nonexistent headers 1.618 # can be detected and how. 1.619 @@ -3875,18 +3880,18 @@ 1.620 ac_preproc_ok=: 1.621 break 1.622 fi 1.623 -rm -f conftest.err conftest.$ac_ext 1.624 +rm -f conftest.err conftest.i conftest.$ac_ext 1.625 1.626 done 1.627 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 1.628 -rm -f conftest.err conftest.$ac_ext 1.629 +rm -f conftest.i conftest.err conftest.$ac_ext 1.630 if $ac_preproc_ok; then : 1.631 1.632 else 1.633 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.634 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.635 -as_fn_error "C preprocessor \"$CPP\" fails sanity check 1.636 -See \`config.log' for more details." "$LINENO" 5; } 1.637 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 1.638 +See \`config.log' for more details" "$LINENO" 5 ; } 1.639 fi 1.640 1.641 ac_ext=c 1.642 @@ -3947,7 +3952,7 @@ 1.643 done 1.644 IFS=$as_save_IFS 1.645 if test -z "$ac_cv_path_GREP"; then 1.646 - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 1.647 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 1.648 fi 1.649 else 1.650 ac_cv_path_GREP=$GREP 1.651 @@ -4013,7 +4018,7 @@ 1.652 done 1.653 IFS=$as_save_IFS 1.654 if test -z "$ac_cv_path_EGREP"; then 1.655 - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 1.656 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 1.657 fi 1.658 else 1.659 ac_cv_path_EGREP=$EGREP 1.660 @@ -4407,7 +4412,7 @@ 1.661 # Put the nasty error message in config.log where it belongs 1.662 echo "$GLIB_PKG_ERRORS" >&5 1.663 1.664 - as_fn_error "Package requirements (glib-2.0) were not met: 1.665 + as_fn_error $? "Package requirements (glib-2.0) were not met: 1.666 1.667 $GLIB_PKG_ERRORS 1.668 1.669 @@ -4422,7 +4427,7 @@ 1.670 $as_echo "no" >&6; } 1.671 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.672 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.673 -as_fn_error "The pkg-config script could not be found or is too old. Make sure it 1.674 +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 1.675 is in your PATH or set the PKG_CONFIG environment variable to the full 1.676 path to pkg-config. 1.677 1.678 @@ -4431,7 +4436,7 @@ 1.679 See the pkg-config man page for more details. 1.680 1.681 To get pkg-config, see <http://pkg-config.freedesktop.org/>. 1.682 -See \`config.log' for more details." "$LINENO" 5; } 1.683 +See \`config.log' for more details" "$LINENO" 5 ; } 1.684 else 1.685 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS 1.686 GLIB_LIBS=$pkg_cv_GLIB_LIBS 1.687 @@ -4571,7 +4576,7 @@ 1.688 LIBS="$saved_LIBS" 1.689 fi 1.690 if test "$has_resolv" = no; then 1.691 - as_fn_error "\"no libresolv\"" "$LINENO" 5 1.692 + as_fn_error $? "\"no libresolv\"" "$LINENO" 5 1.693 RESOLV_LIBS='' 1.694 fi 1.695 fi 1.696 @@ -4723,8 +4728,7 @@ 1.697 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 1.698 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 1.699 " 1.700 -eval as_val=\$$as_ac_Header 1.701 - if test "x$as_val" = x""yes; then : 1.702 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 1.703 cat >>confdefs.h <<_ACEOF 1.704 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1.705 _ACEOF 1.706 @@ -4738,8 +4742,7 @@ 1.707 do : 1.708 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 1.709 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 1.710 -eval as_val=\$$as_ac_Header 1.711 - if test "x$as_val" = x""yes; then : 1.712 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 1.713 cat >>confdefs.h <<_ACEOF 1.714 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 1.715 _ACEOF 1.716 @@ -5085,8 +5088,7 @@ 1.717 do : 1.718 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 1.719 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 1.720 -eval as_val=\$$as_ac_var 1.721 - if test "x$as_val" = x""yes; then : 1.722 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 1.723 cat >>confdefs.h <<_ACEOF 1.724 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 1.725 _ACEOF 1.726 @@ -5214,7 +5216,7 @@ 1.727 if test "x$ac_cv_lib_crypto_MD5" = x""yes; then : 1.728 has_crypto='yes' 1.729 else 1.730 - as_fn_error "'no libcrypto'" "$LINENO" 5 1.731 + as_fn_error $? "'no libcrypto'" "$LINENO" 5 1.732 fi 1.733 1.734 if test "x$has_crypto" = 'xyes'; then 1.735 @@ -5339,7 +5341,7 @@ 1.736 if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then : 1.737 has_lockfile=yes 1.738 else 1.739 - as_fn_error "\"no liblockfile\"" "$LINENO" 5 1.740 + as_fn_error $? "\"no liblockfile\"" "$LINENO" 5 1.741 fi 1.742 1.743 LOCKFILE_LIBS='-llockfile' 1.744 @@ -5513,6 +5515,7 @@ 1.745 1.746 ac_libobjs= 1.747 ac_ltlibobjs= 1.748 +U= 1.749 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 1.750 # 1. Remove the extension, and $U if already installed. 1.751 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 1.752 @@ -5536,11 +5539,11 @@ 1.753 fi 1.754 1.755 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 1.756 - as_fn_error "conditional \"AMDEP\" was never defined. 1.757 + as_fn_error $? "conditional \"AMDEP\" was never defined. 1.758 Usually this means the macro was only invoked conditionally." "$LINENO" 5 1.759 fi 1.760 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 1.761 - as_fn_error "conditional \"am__fastdepCC\" was never defined. 1.762 + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 1.763 Usually this means the macro was only invoked conditionally." "$LINENO" 5 1.764 fi 1.765 1.766 @@ -5690,19 +5693,19 @@ 1.767 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 1.768 1.769 1.770 -# as_fn_error ERROR [LINENO LOG_FD] 1.771 -# --------------------------------- 1.772 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 1.773 +# ---------------------------------------- 1.774 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 1.775 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 1.776 -# script with status $?, using 1 if that was 0. 1.777 +# script with STATUS, using 1 if that was 0. 1.778 as_fn_error () 1.779 { 1.780 - as_status=$?; test $as_status -eq 0 && as_status=1 1.781 - if test "$3"; then 1.782 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.783 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 1.784 + as_status=$1; test $as_status -eq 0 && as_status=1 1.785 + if test "$4"; then 1.786 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.787 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 1.788 fi 1.789 - $as_echo "$as_me: error: $1" >&2 1.790 + $as_echo "$as_me: error: $2" >&2 1.791 as_fn_exit $as_status 1.792 } # as_fn_error 1.793 1.794 @@ -5898,7 +5901,7 @@ 1.795 test -d "$as_dir" && break 1.796 done 1.797 test -z "$as_dirs" || eval "mkdir $as_dirs" 1.798 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 1.799 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 1.800 1.801 1.802 } # as_fn_mkdir_p 1.803 @@ -5951,8 +5954,8 @@ 1.804 # report actual input values of CONFIG_FILES etc. instead of their 1.805 # values after options handling. 1.806 ac_log=" 1.807 -This file was extended by masqmail $as_me 0.3.1, which was 1.808 -generated by GNU Autoconf 2.65. Invocation command line was 1.809 +This file was extended by masqmail $as_me 0.3.2-dev, which was 1.810 +generated by GNU Autoconf 2.67. Invocation command line was 1.811 1.812 CONFIG_FILES = $CONFIG_FILES 1.813 CONFIG_HEADERS = $CONFIG_HEADERS 1.814 @@ -6017,11 +6020,11 @@ 1.815 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.816 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 1.817 ac_cs_version="\\ 1.818 -masqmail config.status 0.3.1 1.819 -configured by $0, generated by GNU Autoconf 2.65, 1.820 +masqmail config.status 0.3.2-dev 1.821 +configured by $0, generated by GNU Autoconf 2.67, 1.822 with options \\"\$ac_cs_config\\" 1.823 1.824 -Copyright (C) 2009 Free Software Foundation, Inc. 1.825 +Copyright (C) 2010 Free Software Foundation, Inc. 1.826 This config.status script is free software; the Free Software Foundation 1.827 gives unlimited permission to copy, distribute and modify it." 1.828 1.829 @@ -6039,11 +6042,16 @@ 1.830 while test $# != 0 1.831 do 1.832 case $1 in 1.833 - --*=*) 1.834 + --*=?*) 1.835 ac_option=`expr "X$1" : 'X\([^=]*\)='` 1.836 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 1.837 ac_shift=: 1.838 ;; 1.839 + --*=) 1.840 + ac_option=`expr "X$1" : 'X\([^=]*\)='` 1.841 + ac_optarg= 1.842 + ac_shift=: 1.843 + ;; 1.844 *) 1.845 ac_option=$1 1.846 ac_optarg=$2 1.847 @@ -6065,6 +6073,7 @@ 1.848 $ac_shift 1.849 case $ac_optarg in 1.850 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 1.851 + '') as_fn_error $? "missing file argument" ;; 1.852 esac 1.853 as_fn_append CONFIG_FILES " '$ac_optarg'" 1.854 ac_need_defaults=false;; 1.855 @@ -6077,7 +6086,7 @@ 1.856 ac_need_defaults=false;; 1.857 --he | --h) 1.858 # Conflict between --help and --header 1.859 - as_fn_error "ambiguous option: \`$1' 1.860 + as_fn_error $? "ambiguous option: \`$1' 1.861 Try \`$0 --help' for more information.";; 1.862 --help | --hel | -h ) 1.863 $as_echo "$ac_cs_usage"; exit ;; 1.864 @@ -6086,7 +6095,7 @@ 1.865 ac_cs_silent=: ;; 1.866 1.867 # This is an error. 1.868 - -*) as_fn_error "unrecognized option: \`$1' 1.869 + -*) as_fn_error $? "unrecognized option: \`$1' 1.870 Try \`$0 --help' for more information." ;; 1.871 1.872 *) as_fn_append ac_config_targets " $1" 1.873 @@ -6149,7 +6158,7 @@ 1.874 "src/libident/Makefile") CONFIG_FILES="$CONFIG_FILES src/libident/Makefile" ;; 1.875 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; 1.876 1.877 - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 1.878 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 1.879 esac 1.880 done 1.881 1.882 @@ -6187,7 +6196,7 @@ 1.883 { 1.884 tmp=./conf$$-$RANDOM 1.885 (umask 077 && mkdir "$tmp") 1.886 -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 1.887 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 1.888 1.889 # Set up the scripts for CONFIG_FILES section. 1.890 # No need to generate them if there are no CONFIG_FILES. 1.891 @@ -6204,7 +6213,7 @@ 1.892 fi 1.893 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 1.894 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 1.895 - ac_cs_awk_cr='\r' 1.896 + ac_cs_awk_cr='\\r' 1.897 else 1.898 ac_cs_awk_cr=$ac_cr 1.899 fi 1.900 @@ -6218,18 +6227,18 @@ 1.901 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 1.902 echo "_ACEOF" 1.903 } >conf$$subs.sh || 1.904 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 1.905 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 1.906 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 1.907 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 1.908 ac_delim='%!_!# ' 1.909 for ac_last_try in false false false false false :; do 1.910 . ./conf$$subs.sh || 1.911 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 1.912 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 1.913 1.914 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 1.915 if test $ac_delim_n = $ac_delim_num; then 1.916 break 1.917 elif $ac_last_try; then 1.918 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 1.919 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 1.920 else 1.921 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 1.922 fi 1.923 @@ -6318,20 +6327,28 @@ 1.924 else 1.925 cat 1.926 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 1.927 - || as_fn_error "could not setup config files machinery" "$LINENO" 5 1.928 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 1.929 _ACEOF 1.930 1.931 -# VPATH may cause trouble with some makes, so we remove $(srcdir), 1.932 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 1.933 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 1.934 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 1.935 # trailing colons and then remove the whole line if VPATH becomes empty 1.936 # (actually we leave an empty line to preserve line numbers). 1.937 if test "x$srcdir" = x.; then 1.938 - ac_vpsub='/^[ ]*VPATH[ ]*=/{ 1.939 -s/:*\$(srcdir):*/:/ 1.940 -s/:*\${srcdir}:*/:/ 1.941 -s/:*@srcdir@:*/:/ 1.942 -s/^\([^=]*=[ ]*\):*/\1/ 1.943 + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 1.944 +h 1.945 +s/// 1.946 +s/^/:/ 1.947 +s/[ ]*$/:/ 1.948 +s/:\$(srcdir):/:/g 1.949 +s/:\${srcdir}:/:/g 1.950 +s/:@srcdir@:/:/g 1.951 +s/^:*// 1.952 s/:*$// 1.953 +x 1.954 +s/\(=[ ]*\).*/\1/ 1.955 +G 1.956 +s/\n// 1.957 s/^[^=]*=[ ]*$// 1.958 }' 1.959 fi 1.960 @@ -6359,7 +6376,7 @@ 1.961 if test -z "$ac_t"; then 1.962 break 1.963 elif $ac_last_try; then 1.964 - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 1.965 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 1.966 else 1.967 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 1.968 fi 1.969 @@ -6444,7 +6461,7 @@ 1.970 _ACAWK 1.971 _ACEOF 1.972 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 1.973 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 1.974 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 1.975 fi # test -n "$CONFIG_HEADERS" 1.976 1.977 1.978 @@ -6457,7 +6474,7 @@ 1.979 esac 1.980 case $ac_mode$ac_tag in 1.981 :[FHL]*:*);; 1.982 - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 1.983 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 1.984 :[FH]-) ac_tag=-:-;; 1.985 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 1.986 esac 1.987 @@ -6485,7 +6502,7 @@ 1.988 [\\/$]*) false;; 1.989 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 1.990 esac || 1.991 - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 1.992 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 1.993 esac 1.994 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 1.995 as_fn_append ac_file_inputs " '$ac_f'" 1.996 @@ -6512,7 +6529,7 @@ 1.997 1.998 case $ac_tag in 1.999 *:-:* | *:-) cat >"$tmp/stdin" \ 1.1000 - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 1.1001 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.1002 esac 1.1003 ;; 1.1004 esac 1.1005 @@ -6649,22 +6666,22 @@ 1.1006 $ac_datarootdir_hack 1.1007 " 1.1008 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 1.1009 - || as_fn_error "could not create $ac_file" "$LINENO" 5 1.1010 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.1011 1.1012 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 1.1013 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 1.1014 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 1.1015 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.1016 -which seems to be undefined. Please make sure it is defined." >&5 1.1017 +which seems to be undefined. Please make sure it is defined" >&5 1.1018 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.1019 -which seems to be undefined. Please make sure it is defined." >&2;} 1.1020 +which seems to be undefined. Please make sure it is defined" >&2;} 1.1021 1.1022 rm -f "$tmp/stdin" 1.1023 case $ac_file in 1.1024 -) cat "$tmp/out" && rm -f "$tmp/out";; 1.1025 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 1.1026 esac \ 1.1027 - || as_fn_error "could not create $ac_file" "$LINENO" 5 1.1028 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.1029 ;; 1.1030 :H) 1.1031 # 1.1032 @@ -6675,19 +6692,19 @@ 1.1033 $as_echo "/* $configure_input */" \ 1.1034 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 1.1035 } >"$tmp/config.h" \ 1.1036 - || as_fn_error "could not create $ac_file" "$LINENO" 5 1.1037 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.1038 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 1.1039 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 1.1040 $as_echo "$as_me: $ac_file is unchanged" >&6;} 1.1041 else 1.1042 rm -f "$ac_file" 1.1043 mv "$tmp/config.h" "$ac_file" \ 1.1044 - || as_fn_error "could not create $ac_file" "$LINENO" 5 1.1045 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.1046 fi 1.1047 else 1.1048 $as_echo "/* $configure_input */" \ 1.1049 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 1.1050 - || as_fn_error "could not create -" "$LINENO" 5 1.1051 + || as_fn_error $? "could not create -" "$LINENO" 5 1.1052 fi 1.1053 # Compute "$ac_file"'s index in $config_headers. 1.1054 _am_arg="$ac_file" 1.1055 @@ -6837,7 +6854,7 @@ 1.1056 ac_clean_files=$ac_clean_files_save 1.1057 1.1058 test $ac_write_fail = 0 || 1.1059 - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 1.1060 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 1.1061 1.1062 1.1063 # configure is writing to config.log, and then calls config.status. 1.1064 @@ -6858,7 +6875,7 @@ 1.1065 exec 5>>config.log 1.1066 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 1.1067 # would make configure fail if this is the last instruction. 1.1068 - $ac_cs_success || as_fn_exit $? 1.1069 + $ac_cs_success || as_fn_exit 1 1.1070 fi 1.1071 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 1.1072 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5