masqmail
changeset 296:e3e1a030c703
ran aclocal and autoconf
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Thu, 09 Dec 2010 10:58:40 -0300 |
| parents | a6404efa35bc |
| children | b639e97feda3 |
| files | aclocal.m4 configure |
| diffstat | 2 files changed, 191 insertions(+), 174 deletions(-) [+] |
line diff
1.1 --- a/aclocal.m4 Thu Dec 09 10:57:40 2010 -0300 1.2 +++ b/aclocal.m4 Thu Dec 09 10:58:40 2010 -0300 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.67],, 1.10 +[m4_warning([this file was generated for autoconf 2.67. 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 Thu Dec 09 10:57:40 2010 -0300 2.2 +++ b/configure Thu Dec 09 10:58:40 2010 -0300 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.3.1. 2.7 +# Generated by GNU Autoconf 2.67 for masqmail 0.3.2-dev. 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 @@ -319,7 +319,7 @@ 2.21 test -d "$as_dir" && break 2.22 done 2.23 test -z "$as_dirs" || eval "mkdir $as_dirs" 2.24 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 2.25 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 2.26 2.27 2.28 } # as_fn_mkdir_p 2.29 @@ -359,19 +359,19 @@ 2.30 fi # as_fn_arith 2.31 2.32 2.33 -# as_fn_error ERROR [LINENO LOG_FD] 2.34 -# --------------------------------- 2.35 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 2.36 +# ---------------------------------------- 2.37 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 2.38 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 2.39 -# script with status $?, using 1 if that was 0. 2.40 +# script with STATUS, using 1 if that was 0. 2.41 as_fn_error () 2.42 { 2.43 - as_status=$?; test $as_status -eq 0 && as_status=1 2.44 - if test "$3"; then 2.45 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.46 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 2.47 + as_status=$1; test $as_status -eq 0 && as_status=1 2.48 + if test "$4"; then 2.49 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.50 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 2.51 fi 2.52 - $as_echo "$as_me: error: $1" >&2 2.53 + $as_echo "$as_me: error: $2" >&2 2.54 as_fn_exit $as_status 2.55 } # as_fn_error 2.56 2.57 @@ -533,7 +533,7 @@ 2.58 exec 6>&1 2.59 2.60 # Name of the host. 2.61 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 2.62 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 2.63 # so uname gets run too. 2.64 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 2.65 2.66 @@ -552,8 +552,8 @@ 2.67 # Identity of this package. 2.68 PACKAGE_NAME='masqmail' 2.69 PACKAGE_TARNAME='masqmail' 2.70 -PACKAGE_VERSION='0.3.1' 2.71 -PACKAGE_STRING='masqmail 0.3.1' 2.72 +PACKAGE_VERSION='0.3.2-dev' 2.73 +PACKAGE_STRING='masqmail 0.3.2-dev' 2.74 PACKAGE_BUGREPORT='meillo@marmaro.de' 2.75 PACKAGE_URL='' 2.76 2.77 @@ -788,8 +788,9 @@ 2.78 fi 2.79 2.80 case $ac_option in 2.81 - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 2.82 - *) ac_optarg=yes ;; 2.83 + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 2.84 + *=) ac_optarg= ;; 2.85 + *) ac_optarg=yes ;; 2.86 esac 2.87 2.88 # Accept the important Cygnus configure options, so we can diagnose typos. 2.89 @@ -834,7 +835,7 @@ 2.90 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 2.91 # Reject names that are not valid shell variable names. 2.92 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.93 - as_fn_error "invalid feature name: $ac_useropt" 2.94 + as_fn_error $? "invalid feature name: $ac_useropt" 2.95 ac_useropt_orig=$ac_useropt 2.96 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.97 case $ac_user_opts in 2.98 @@ -860,7 +861,7 @@ 2.99 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 2.100 # Reject names that are not valid shell variable names. 2.101 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.102 - as_fn_error "invalid feature name: $ac_useropt" 2.103 + as_fn_error $? "invalid feature name: $ac_useropt" 2.104 ac_useropt_orig=$ac_useropt 2.105 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.106 case $ac_user_opts in 2.107 @@ -1064,7 +1065,7 @@ 2.108 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 2.109 # Reject names that are not valid shell variable names. 2.110 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.111 - as_fn_error "invalid package name: $ac_useropt" 2.112 + as_fn_error $? "invalid package name: $ac_useropt" 2.113 ac_useropt_orig=$ac_useropt 2.114 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.115 case $ac_user_opts in 2.116 @@ -1080,7 +1081,7 @@ 2.117 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 2.118 # Reject names that are not valid shell variable names. 2.119 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 2.120 - as_fn_error "invalid package name: $ac_useropt" 2.121 + as_fn_error $? "invalid package name: $ac_useropt" 2.122 ac_useropt_orig=$ac_useropt 2.123 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 2.124 case $ac_user_opts in 2.125 @@ -1110,8 +1111,8 @@ 2.126 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 2.127 x_libraries=$ac_optarg ;; 2.128 2.129 - -*) as_fn_error "unrecognized option: \`$ac_option' 2.130 -Try \`$0 --help' for more information." 2.131 + -*) as_fn_error $? "unrecognized option: \`$ac_option' 2.132 +Try \`$0 --help' for more information" 2.133 ;; 2.134 2.135 *=*) 2.136 @@ -1119,7 +1120,7 @@ 2.137 # Reject names that are not valid shell variable names. 2.138 case $ac_envvar in #( 2.139 '' | [0-9]* | *[!_$as_cr_alnum]* ) 2.140 - as_fn_error "invalid variable name: \`$ac_envvar'" ;; 2.141 + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 2.142 esac 2.143 eval $ac_envvar=\$ac_optarg 2.144 export $ac_envvar ;; 2.145 @@ -1137,13 +1138,13 @@ 2.146 2.147 if test -n "$ac_prev"; then 2.148 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 2.149 - as_fn_error "missing argument to $ac_option" 2.150 + as_fn_error $? "missing argument to $ac_option" 2.151 fi 2.152 2.153 if test -n "$ac_unrecognized_opts"; then 2.154 case $enable_option_checking in 2.155 no) ;; 2.156 - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 2.157 + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 2.158 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 2.159 esac 2.160 fi 2.161 @@ -1166,7 +1167,7 @@ 2.162 [\\/$]* | ?:[\\/]* ) continue;; 2.163 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 2.164 esac 2.165 - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 2.166 + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 2.167 done 2.168 2.169 # There might be people who depend on the old broken behavior: `$host' 2.170 @@ -1180,8 +1181,8 @@ 2.171 if test "x$host_alias" != x; then 2.172 if test "x$build_alias" = x; then 2.173 cross_compiling=maybe 2.174 - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 2.175 - If a cross compiler is detected then cross compile mode will be used." >&2 2.176 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 2.177 + If a cross compiler is detected then cross compile mode will be used" >&2 2.178 elif test "x$build_alias" != "x$host_alias"; then 2.179 cross_compiling=yes 2.180 fi 2.181 @@ -1196,9 +1197,9 @@ 2.182 ac_pwd=`pwd` && test -n "$ac_pwd" && 2.183 ac_ls_di=`ls -di .` && 2.184 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 2.185 - as_fn_error "working directory cannot be determined" 2.186 + as_fn_error $? "working directory cannot be determined" 2.187 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 2.188 - as_fn_error "pwd does not report name of working directory" 2.189 + as_fn_error $? "pwd does not report name of working directory" 2.190 2.191 2.192 # Find the source files, if location was not specified. 2.193 @@ -1237,11 +1238,11 @@ 2.194 fi 2.195 if test ! -r "$srcdir/$ac_unique_file"; then 2.196 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 2.197 - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 2.198 + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 2.199 fi 2.200 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 2.201 ac_abs_confdir=`( 2.202 - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 2.203 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 2.204 pwd)` 2.205 # When building in place, set srcdir=. 2.206 if test "$ac_abs_confdir" = "$ac_pwd"; then 2.207 @@ -1267,7 +1268,7 @@ 2.208 # Omit some internal or obsolete options to make the list less imposing. 2.209 # This message is too long to be a string in the A/UX 3.1 sh. 2.210 cat <<_ACEOF 2.211 -\`configure' configures masqmail 0.3.1 to adapt to many kinds of systems. 2.212 +\`configure' configures masqmail 0.3.2-dev to adapt to many kinds of systems. 2.213 2.214 Usage: $0 [OPTION]... [VAR=VALUE]... 2.215 2.216 @@ -1281,7 +1282,7 @@ 2.217 --help=short display options specific to this package 2.218 --help=recursive display the short help of all the included packages 2.219 -V, --version display version information and exit 2.220 - -q, --quiet, --silent do not print \`checking...' messages 2.221 + -q, --quiet, --silent do not print \`checking ...' messages 2.222 --cache-file=FILE cache test results in FILE [disabled] 2.223 -C, --config-cache alias for \`--cache-file=config.cache' 2.224 -n, --no-create do not create output files 2.225 @@ -1333,7 +1334,7 @@ 2.226 2.227 if test -n "$ac_init_help"; then 2.228 case $ac_init_help in 2.229 - short | recursive ) echo "Configuration of masqmail 0.3.1:";; 2.230 + short | recursive ) echo "Configuration of masqmail 0.3.2-dev:";; 2.231 esac 2.232 cat <<\_ACEOF 2.233 2.234 @@ -1442,10 +1443,10 @@ 2.235 test -n "$ac_init_help" && exit $ac_status 2.236 if $ac_init_version; then 2.237 cat <<\_ACEOF 2.238 -masqmail configure 0.3.1 2.239 -generated by GNU Autoconf 2.65 2.240 - 2.241 -Copyright (C) 2009 Free Software Foundation, Inc. 2.242 +masqmail configure 0.3.2-dev 2.243 +generated by GNU Autoconf 2.67 2.244 + 2.245 +Copyright (C) 2010 Free Software Foundation, Inc. 2.246 This configure script is free software; the Free Software Foundation 2.247 gives unlimited permission to copy, distribute and modify it. 2.248 _ACEOF 2.249 @@ -1561,7 +1562,7 @@ 2.250 mv -f conftest.er1 conftest.err 2.251 fi 2.252 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2.253 - test $ac_status = 0; } >/dev/null && { 2.254 + test $ac_status = 0; } > conftest.i && { 2.255 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 2.256 test ! -s conftest.err 2.257 }; then : 2.258 @@ -1627,7 +1628,7 @@ 2.259 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.261 $as_echo_n "checking for $2... " >&6; } 2.262 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.263 +if eval "test \"\${$3+set}\"" = set; then : 2.264 $as_echo_n "(cached) " >&6 2.265 else 2.266 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.267 @@ -1694,10 +1695,10 @@ 2.268 ac_fn_c_check_header_mongrel () 2.269 { 2.270 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.271 - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.272 + if eval "test \"\${$3+set}\"" = set; then : 2.273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.274 $as_echo_n "checking for $2... " >&6; } 2.275 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.276 +if eval "test \"\${$3+set}\"" = set; then : 2.277 $as_echo_n "(cached) " >&6 2.278 fi 2.279 eval ac_res=\$$3 2.280 @@ -1733,7 +1734,7 @@ 2.281 else 2.282 ac_header_preproc=no 2.283 fi 2.284 -rm -f conftest.err conftest.$ac_ext 2.285 +rm -f conftest.err conftest.i conftest.$ac_ext 2.286 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2.287 $as_echo "$ac_header_preproc" >&6; } 2.288 2.289 @@ -1756,17 +1757,15 @@ 2.290 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 2.291 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2.292 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2.293 -( cat <<\_ASBOX 2.294 -## -------------------------------- ## 2.295 +( $as_echo "## -------------------------------- ## 2.296 ## Report this to meillo@marmaro.de ## 2.297 -## -------------------------------- ## 2.298 -_ASBOX 2.299 +## -------------------------------- ##" 2.300 ) | sed "s/^/$as_me: WARNING: /" >&2 2.301 ;; 2.302 esac 2.303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.304 $as_echo_n "checking for $2... " >&6; } 2.305 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.306 +if eval "test \"\${$3+set}\"" = set; then : 2.307 $as_echo_n "(cached) " >&6 2.308 else 2.309 eval "$3=\$ac_header_compiler" 2.310 @@ -1788,7 +1787,7 @@ 2.311 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.312 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.313 $as_echo_n "checking for $2... " >&6; } 2.314 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.315 +if eval "test \"\${$3+set}\"" = set; then : 2.316 $as_echo_n "(cached) " >&6 2.317 else 2.318 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.319 @@ -1819,7 +1818,7 @@ 2.320 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.321 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.322 $as_echo_n "checking for $2... " >&6; } 2.323 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2.324 +if eval "test \"\${$3+set}\"" = set; then : 2.325 $as_echo_n "(cached) " >&6 2.326 else 2.327 eval "$3=no" 2.328 @@ -1867,8 +1866,8 @@ 2.329 This file contains any messages produced by compilers while 2.330 running configure, to aid debugging if configure makes a mistake. 2.331 2.332 -It was created by masqmail $as_me 0.3.1, which was 2.333 -generated by GNU Autoconf 2.65. Invocation command line was 2.334 +It was created by masqmail $as_me 0.3.2-dev, which was 2.335 +generated by GNU Autoconf 2.67. Invocation command line was 2.336 2.337 $ $0 $@ 2.338 2.339 @@ -1978,11 +1977,9 @@ 2.340 { 2.341 echo 2.342 2.343 - cat <<\_ASBOX 2.344 -## ---------------- ## 2.345 + $as_echo "## ---------------- ## 2.346 ## Cache variables. ## 2.347 -## ---------------- ## 2.348 -_ASBOX 2.349 +## ---------------- ##" 2.350 echo 2.351 # The following way of writing the cache mishandles newlines in values, 2.352 ( 2.353 @@ -2016,11 +2013,9 @@ 2.354 ) 2.355 echo 2.356 2.357 - cat <<\_ASBOX 2.358 -## ----------------- ## 2.359 + $as_echo "## ----------------- ## 2.360 ## Output variables. ## 2.361 -## ----------------- ## 2.362 -_ASBOX 2.363 +## ----------------- ##" 2.364 echo 2.365 for ac_var in $ac_subst_vars 2.366 do 2.367 @@ -2033,11 +2028,9 @@ 2.368 echo 2.369 2.370 if test -n "$ac_subst_files"; then 2.371 - cat <<\_ASBOX 2.372 -## ------------------- ## 2.373 + $as_echo "## ------------------- ## 2.374 ## File substitutions. ## 2.375 -## ------------------- ## 2.376 -_ASBOX 2.377 +## ------------------- ##" 2.378 echo 2.379 for ac_var in $ac_subst_files 2.380 do 2.381 @@ -2051,11 +2044,9 @@ 2.382 fi 2.383 2.384 if test -s confdefs.h; then 2.385 - cat <<\_ASBOX 2.386 -## ----------- ## 2.387 + $as_echo "## ----------- ## 2.388 ## confdefs.h. ## 2.389 -## ----------- ## 2.390 -_ASBOX 2.391 +## ----------- ##" 2.392 echo 2.393 cat confdefs.h 2.394 echo 2.395 @@ -2110,7 +2101,12 @@ 2.396 ac_site_file1=NONE 2.397 ac_site_file2=NONE 2.398 if test -n "$CONFIG_SITE"; then 2.399 - ac_site_file1=$CONFIG_SITE 2.400 + # We do not want a PATH search for config.site. 2.401 + case $CONFIG_SITE in #(( 2.402 + -*) ac_site_file1=./$CONFIG_SITE;; 2.403 + */*) ac_site_file1=$CONFIG_SITE;; 2.404 + *) ac_site_file1=./$CONFIG_SITE;; 2.405 + esac 2.406 elif test "x$prefix" != xNONE; then 2.407 ac_site_file1=$prefix/share/config.site 2.408 ac_site_file2=$prefix/etc/config.site 2.409 @@ -2125,7 +2121,11 @@ 2.410 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2.411 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2.412 sed 's/^/| /' "$ac_site_file" >&5 2.413 - . "$ac_site_file" 2.414 + . "$ac_site_file" \ 2.415 + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.416 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.417 +as_fn_error $? "failed to load site script $ac_site_file 2.418 +See \`config.log' for more details" "$LINENO" 5 ; } 2.419 fi 2.420 done 2.421 2.422 @@ -2201,7 +2201,7 @@ 2.423 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.424 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2.425 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2.426 - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2.427 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2.428 fi 2.429 ## -------------------- ## 2.430 ## Main body of script. ## 2.431 @@ -2221,16 +2221,22 @@ 2.432 2.433 ac_aux_dir= 2.434 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2.435 - for ac_t in install-sh install.sh shtool; do 2.436 - if test -f "$ac_dir/$ac_t"; then 2.437 - ac_aux_dir=$ac_dir 2.438 - ac_install_sh="$ac_aux_dir/$ac_t -c" 2.439 - break 2 2.440 - fi 2.441 - done 2.442 + if test -f "$ac_dir/install-sh"; then 2.443 + ac_aux_dir=$ac_dir 2.444 + ac_install_sh="$ac_aux_dir/install-sh -c" 2.445 + break 2.446 + elif test -f "$ac_dir/install.sh"; then 2.447 + ac_aux_dir=$ac_dir 2.448 + ac_install_sh="$ac_aux_dir/install.sh -c" 2.449 + break 2.450 + elif test -f "$ac_dir/shtool"; then 2.451 + ac_aux_dir=$ac_dir 2.452 + ac_install_sh="$ac_aux_dir/shtool install -c" 2.453 + break 2.454 + fi 2.455 done 2.456 if test -z "$ac_aux_dir"; then 2.457 - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2.458 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2.459 fi 2.460 2.461 # These three variables are undocumented and unsupported, 2.462 @@ -2346,11 +2352,11 @@ 2.463 ' 2.464 case `pwd` in 2.465 *[\\\"\#\$\&\'\`$am_lf]*) 2.466 - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; 2.467 + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; 2.468 esac 2.469 case $srcdir in 2.470 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 2.471 - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 2.472 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; 2.473 esac 2.474 2.475 # Do `set' in a subshell so we don't clobber the current shell's 2.476 @@ -2372,7 +2378,7 @@ 2.477 # if, for instance, CONFIG_SHELL is bash and it inherits a 2.478 # broken ls alias from the environment. This has actually 2.479 # happened. Such a system could not be considered "sane". 2.480 - as_fn_error "ls -t appears to fail. Make sure there is not a broken 2.481 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 2.482 alias in your environment" "$LINENO" 5 2.483 fi 2.484 2.485 @@ -2382,7 +2388,7 @@ 2.486 # Ok. 2.487 : 2.488 else 2.489 - as_fn_error "newly created file is older than distributed files! 2.490 + as_fn_error $? "newly created file is older than distributed files! 2.491 Check your system clock" "$LINENO" 5 2.492 fi 2.493 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.494 @@ -2620,7 +2626,7 @@ 2.495 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2.496 set x ${MAKE-make} 2.497 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2.498 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 2.499 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : 2.500 $as_echo_n "(cached) " >&6 2.501 else 2.502 cat >conftest.make <<\_ACEOF 2.503 @@ -2628,7 +2634,7 @@ 2.504 all: 2.505 @echo '@@@%%%=$(MAKE)=@@@%%%' 2.506 _ACEOF 2.507 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 2.508 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 2.509 case `${MAKE-make} -f conftest.make 2>/dev/null` in 2.510 *@@@%%%=?*=@@@%%%*) 2.511 eval ac_cv_prog_make_${ac_make}_set=yes;; 2.512 @@ -2662,7 +2668,7 @@ 2.513 am__isrc=' -I$(srcdir)' 2.514 # test to see if srcdir already configured 2.515 if test -f $srcdir/config.status; then 2.516 - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 2.517 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 2.518 fi 2.519 fi 2.520 2.521 @@ -2678,7 +2684,7 @@ 2.522 2.523 # Define the identity of the package. 2.524 PACKAGE='masqmail' 2.525 - VERSION='0.3.1' 2.526 + VERSION='0.3.2-dev' 2.527 2.528 2.529 cat >>confdefs.h <<_ACEOF 2.530 @@ -3021,8 +3027,8 @@ 2.531 2.532 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.533 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.534 -as_fn_error "no acceptable C compiler found in \$PATH 2.535 -See \`config.log' for more details." "$LINENO" 5; } 2.536 +as_fn_error $? "no acceptable C compiler found in \$PATH 2.537 +See \`config.log' for more details" "$LINENO" 5 ; } 2.538 2.539 # Provide some information about the compiler. 2.540 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 2.541 @@ -3136,9 +3142,8 @@ 2.542 2.543 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.544 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.545 -{ as_fn_set_status 77 2.546 -as_fn_error "C compiler cannot create executables 2.547 -See \`config.log' for more details." "$LINENO" 5; }; } 2.548 +as_fn_error 77 "C compiler cannot create executables 2.549 +See \`config.log' for more details" "$LINENO" 5 ; } 2.550 else 2.551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.552 $as_echo "yes" >&6; } 2.553 @@ -3180,8 +3185,8 @@ 2.554 else 2.555 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.556 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.557 -as_fn_error "cannot compute suffix of executables: cannot compile and link 2.558 -See \`config.log' for more details." "$LINENO" 5; } 2.559 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link 2.560 +See \`config.log' for more details" "$LINENO" 5 ; } 2.561 fi 2.562 rm -f conftest conftest$ac_cv_exeext 2.563 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 2.564 @@ -3238,9 +3243,9 @@ 2.565 else 2.566 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.567 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.568 -as_fn_error "cannot run C compiled programs. 2.569 +as_fn_error $? "cannot run C compiled programs. 2.570 If you meant to cross compile, use \`--host'. 2.571 -See \`config.log' for more details." "$LINENO" 5; } 2.572 +See \`config.log' for more details" "$LINENO" 5 ; } 2.573 fi 2.574 fi 2.575 fi 2.576 @@ -3291,8 +3296,8 @@ 2.577 2.578 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.579 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.580 -as_fn_error "cannot compute suffix of object files: cannot compile 2.581 -See \`config.log' for more details." "$LINENO" 5; } 2.582 +as_fn_error $? "cannot compute suffix of object files: cannot compile 2.583 +See \`config.log' for more details" "$LINENO" 5 ; } 2.584 fi 2.585 rm -f conftest.$ac_cv_objext conftest.$ac_ext 2.586 fi 2.587 @@ -3800,7 +3805,7 @@ 2.588 # Broken: fails on valid input. 2.589 continue 2.590 fi 2.591 -rm -f conftest.err conftest.$ac_ext 2.592 +rm -f conftest.err conftest.i conftest.$ac_ext 2.593 2.594 # OK, works on sane cases. Now check whether nonexistent headers 2.595 # can be detected and how. 2.596 @@ -3816,11 +3821,11 @@ 2.597 ac_preproc_ok=: 2.598 break 2.599 fi 2.600 -rm -f conftest.err conftest.$ac_ext 2.601 +rm -f conftest.err conftest.i conftest.$ac_ext 2.602 2.603 done 2.604 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2.605 -rm -f conftest.err conftest.$ac_ext 2.606 +rm -f conftest.i conftest.err conftest.$ac_ext 2.607 if $ac_preproc_ok; then : 2.608 break 2.609 fi 2.610 @@ -3859,7 +3864,7 @@ 2.611 # Broken: fails on valid input. 2.612 continue 2.613 fi 2.614 -rm -f conftest.err conftest.$ac_ext 2.615 +rm -f conftest.err conftest.i conftest.$ac_ext 2.616 2.617 # OK, works on sane cases. Now check whether nonexistent headers 2.618 # can be detected and how. 2.619 @@ -3875,18 +3880,18 @@ 2.620 ac_preproc_ok=: 2.621 break 2.622 fi 2.623 -rm -f conftest.err conftest.$ac_ext 2.624 +rm -f conftest.err conftest.i conftest.$ac_ext 2.625 2.626 done 2.627 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 2.628 -rm -f conftest.err conftest.$ac_ext 2.629 +rm -f conftest.i conftest.err conftest.$ac_ext 2.630 if $ac_preproc_ok; then : 2.631 2.632 else 2.633 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.634 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.635 -as_fn_error "C preprocessor \"$CPP\" fails sanity check 2.636 -See \`config.log' for more details." "$LINENO" 5; } 2.637 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 2.638 +See \`config.log' for more details" "$LINENO" 5 ; } 2.639 fi 2.640 2.641 ac_ext=c 2.642 @@ -3947,7 +3952,7 @@ 2.643 done 2.644 IFS=$as_save_IFS 2.645 if test -z "$ac_cv_path_GREP"; then 2.646 - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.647 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.648 fi 2.649 else 2.650 ac_cv_path_GREP=$GREP 2.651 @@ -4013,7 +4018,7 @@ 2.652 done 2.653 IFS=$as_save_IFS 2.654 if test -z "$ac_cv_path_EGREP"; then 2.655 - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.656 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 2.657 fi 2.658 else 2.659 ac_cv_path_EGREP=$EGREP 2.660 @@ -4407,7 +4412,7 @@ 2.661 # Put the nasty error message in config.log where it belongs 2.662 echo "$GLIB_PKG_ERRORS" >&5 2.663 2.664 - as_fn_error "Package requirements (glib-2.0) were not met: 2.665 + as_fn_error $? "Package requirements (glib-2.0) were not met: 2.666 2.667 $GLIB_PKG_ERRORS 2.668 2.669 @@ -4422,7 +4427,7 @@ 2.670 $as_echo "no" >&6; } 2.671 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.672 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.673 -as_fn_error "The pkg-config script could not be found or is too old. Make sure it 2.674 +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 2.675 is in your PATH or set the PKG_CONFIG environment variable to the full 2.676 path to pkg-config. 2.677 2.678 @@ -4431,7 +4436,7 @@ 2.679 See the pkg-config man page for more details. 2.680 2.681 To get pkg-config, see <http://pkg-config.freedesktop.org/>. 2.682 -See \`config.log' for more details." "$LINENO" 5; } 2.683 +See \`config.log' for more details" "$LINENO" 5 ; } 2.684 else 2.685 GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS 2.686 GLIB_LIBS=$pkg_cv_GLIB_LIBS 2.687 @@ -4571,7 +4576,7 @@ 2.688 LIBS="$saved_LIBS" 2.689 fi 2.690 if test "$has_resolv" = no; then 2.691 - as_fn_error "\"no libresolv\"" "$LINENO" 5 2.692 + as_fn_error $? "\"no libresolv\"" "$LINENO" 5 2.693 RESOLV_LIBS='' 2.694 fi 2.695 fi 2.696 @@ -4723,8 +4728,7 @@ 2.697 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 2.698 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 2.699 " 2.700 -eval as_val=\$$as_ac_Header 2.701 - if test "x$as_val" = x""yes; then : 2.702 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 2.703 cat >>confdefs.h <<_ACEOF 2.704 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 2.705 _ACEOF 2.706 @@ -4738,8 +4742,7 @@ 2.707 do : 2.708 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 2.709 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 2.710 -eval as_val=\$$as_ac_Header 2.711 - if test "x$as_val" = x""yes; then : 2.712 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 2.713 cat >>confdefs.h <<_ACEOF 2.714 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 2.715 _ACEOF 2.716 @@ -5085,8 +5088,7 @@ 2.717 do : 2.718 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 2.719 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 2.720 -eval as_val=\$$as_ac_var 2.721 - if test "x$as_val" = x""yes; then : 2.722 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 2.723 cat >>confdefs.h <<_ACEOF 2.724 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 2.725 _ACEOF 2.726 @@ -5214,7 +5216,7 @@ 2.727 if test "x$ac_cv_lib_crypto_MD5" = x""yes; then : 2.728 has_crypto='yes' 2.729 else 2.730 - as_fn_error "'no libcrypto'" "$LINENO" 5 2.731 + as_fn_error $? "'no libcrypto'" "$LINENO" 5 2.732 fi 2.733 2.734 if test "x$has_crypto" = 'xyes'; then 2.735 @@ -5339,7 +5341,7 @@ 2.736 if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then : 2.737 has_lockfile=yes 2.738 else 2.739 - as_fn_error "\"no liblockfile\"" "$LINENO" 5 2.740 + as_fn_error $? "\"no liblockfile\"" "$LINENO" 5 2.741 fi 2.742 2.743 LOCKFILE_LIBS='-llockfile' 2.744 @@ -5513,6 +5515,7 @@ 2.745 2.746 ac_libobjs= 2.747 ac_ltlibobjs= 2.748 +U= 2.749 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 2.750 # 1. Remove the extension, and $U if already installed. 2.751 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 2.752 @@ -5536,11 +5539,11 @@ 2.753 fi 2.754 2.755 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 2.756 - as_fn_error "conditional \"AMDEP\" was never defined. 2.757 + as_fn_error $? "conditional \"AMDEP\" was never defined. 2.758 Usually this means the macro was only invoked conditionally." "$LINENO" 5 2.759 fi 2.760 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 2.761 - as_fn_error "conditional \"am__fastdepCC\" was never defined. 2.762 + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 2.763 Usually this means the macro was only invoked conditionally." "$LINENO" 5 2.764 fi 2.765 2.766 @@ -5690,19 +5693,19 @@ 2.767 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 2.768 2.769 2.770 -# as_fn_error ERROR [LINENO LOG_FD] 2.771 -# --------------------------------- 2.772 +# as_fn_error STATUS ERROR [LINENO LOG_FD] 2.773 +# ---------------------------------------- 2.774 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 2.775 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 2.776 -# script with status $?, using 1 if that was 0. 2.777 +# script with STATUS, using 1 if that was 0. 2.778 as_fn_error () 2.779 { 2.780 - as_status=$?; test $as_status -eq 0 && as_status=1 2.781 - if test "$3"; then 2.782 - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.783 - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 2.784 + as_status=$1; test $as_status -eq 0 && as_status=1 2.785 + if test "$4"; then 2.786 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.787 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 2.788 fi 2.789 - $as_echo "$as_me: error: $1" >&2 2.790 + $as_echo "$as_me: error: $2" >&2 2.791 as_fn_exit $as_status 2.792 } # as_fn_error 2.793 2.794 @@ -5898,7 +5901,7 @@ 2.795 test -d "$as_dir" && break 2.796 done 2.797 test -z "$as_dirs" || eval "mkdir $as_dirs" 2.798 - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 2.799 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 2.800 2.801 2.802 } # as_fn_mkdir_p 2.803 @@ -5951,8 +5954,8 @@ 2.804 # report actual input values of CONFIG_FILES etc. instead of their 2.805 # values after options handling. 2.806 ac_log=" 2.807 -This file was extended by masqmail $as_me 0.3.1, which was 2.808 -generated by GNU Autoconf 2.65. Invocation command line was 2.809 +This file was extended by masqmail $as_me 0.3.2-dev, which was 2.810 +generated by GNU Autoconf 2.67. Invocation command line was 2.811 2.812 CONFIG_FILES = $CONFIG_FILES 2.813 CONFIG_HEADERS = $CONFIG_HEADERS 2.814 @@ -6017,11 +6020,11 @@ 2.815 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.816 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 2.817 ac_cs_version="\\ 2.818 -masqmail config.status 0.3.1 2.819 -configured by $0, generated by GNU Autoconf 2.65, 2.820 +masqmail config.status 0.3.2-dev 2.821 +configured by $0, generated by GNU Autoconf 2.67, 2.822 with options \\"\$ac_cs_config\\" 2.823 2.824 -Copyright (C) 2009 Free Software Foundation, Inc. 2.825 +Copyright (C) 2010 Free Software Foundation, Inc. 2.826 This config.status script is free software; the Free Software Foundation 2.827 gives unlimited permission to copy, distribute and modify it." 2.828 2.829 @@ -6039,11 +6042,16 @@ 2.830 while test $# != 0 2.831 do 2.832 case $1 in 2.833 - --*=*) 2.834 + --*=?*) 2.835 ac_option=`expr "X$1" : 'X\([^=]*\)='` 2.836 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 2.837 ac_shift=: 2.838 ;; 2.839 + --*=) 2.840 + ac_option=`expr "X$1" : 'X\([^=]*\)='` 2.841 + ac_optarg= 2.842 + ac_shift=: 2.843 + ;; 2.844 *) 2.845 ac_option=$1 2.846 ac_optarg=$2 2.847 @@ -6065,6 +6073,7 @@ 2.848 $ac_shift 2.849 case $ac_optarg in 2.850 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 2.851 + '') as_fn_error $? "missing file argument" ;; 2.852 esac 2.853 as_fn_append CONFIG_FILES " '$ac_optarg'" 2.854 ac_need_defaults=false;; 2.855 @@ -6077,7 +6086,7 @@ 2.856 ac_need_defaults=false;; 2.857 --he | --h) 2.858 # Conflict between --help and --header 2.859 - as_fn_error "ambiguous option: \`$1' 2.860 + as_fn_error $? "ambiguous option: \`$1' 2.861 Try \`$0 --help' for more information.";; 2.862 --help | --hel | -h ) 2.863 $as_echo "$ac_cs_usage"; exit ;; 2.864 @@ -6086,7 +6095,7 @@ 2.865 ac_cs_silent=: ;; 2.866 2.867 # This is an error. 2.868 - -*) as_fn_error "unrecognized option: \`$1' 2.869 + -*) as_fn_error $? "unrecognized option: \`$1' 2.870 Try \`$0 --help' for more information." ;; 2.871 2.872 *) as_fn_append ac_config_targets " $1" 2.873 @@ -6149,7 +6158,7 @@ 2.874 "src/libident/Makefile") CONFIG_FILES="$CONFIG_FILES src/libident/Makefile" ;; 2.875 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; 2.876 2.877 - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 2.878 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 2.879 esac 2.880 done 2.881 2.882 @@ -6187,7 +6196,7 @@ 2.883 { 2.884 tmp=./conf$$-$RANDOM 2.885 (umask 077 && mkdir "$tmp") 2.886 -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 2.887 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 2.888 2.889 # Set up the scripts for CONFIG_FILES section. 2.890 # No need to generate them if there are no CONFIG_FILES. 2.891 @@ -6204,7 +6213,7 @@ 2.892 fi 2.893 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 2.894 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 2.895 - ac_cs_awk_cr='\r' 2.896 + ac_cs_awk_cr='\\r' 2.897 else 2.898 ac_cs_awk_cr=$ac_cr 2.899 fi 2.900 @@ -6218,18 +6227,18 @@ 2.901 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 2.902 echo "_ACEOF" 2.903 } >conf$$subs.sh || 2.904 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.905 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 2.906 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.907 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 2.908 ac_delim='%!_!# ' 2.909 for ac_last_try in false false false false false :; do 2.910 . ./conf$$subs.sh || 2.911 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.912 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.913 2.914 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 2.915 if test $ac_delim_n = $ac_delim_num; then 2.916 break 2.917 elif $ac_last_try; then 2.918 - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 2.919 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 2.920 else 2.921 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 2.922 fi 2.923 @@ -6318,20 +6327,28 @@ 2.924 else 2.925 cat 2.926 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 2.927 - || as_fn_error "could not setup config files machinery" "$LINENO" 5 2.928 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 2.929 _ACEOF 2.930 2.931 -# VPATH may cause trouble with some makes, so we remove $(srcdir), 2.932 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 2.933 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 2.934 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 2.935 # trailing colons and then remove the whole line if VPATH becomes empty 2.936 # (actually we leave an empty line to preserve line numbers). 2.937 if test "x$srcdir" = x.; then 2.938 - ac_vpsub='/^[ ]*VPATH[ ]*=/{ 2.939 -s/:*\$(srcdir):*/:/ 2.940 -s/:*\${srcdir}:*/:/ 2.941 -s/:*@srcdir@:*/:/ 2.942 -s/^\([^=]*=[ ]*\):*/\1/ 2.943 + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 2.944 +h 2.945 +s/// 2.946 +s/^/:/ 2.947 +s/[ ]*$/:/ 2.948 +s/:\$(srcdir):/:/g 2.949 +s/:\${srcdir}:/:/g 2.950 +s/:@srcdir@:/:/g 2.951 +s/^:*// 2.952 s/:*$// 2.953 +x 2.954 +s/\(=[ ]*\).*/\1/ 2.955 +G 2.956 +s/\n// 2.957 s/^[^=]*=[ ]*$// 2.958 }' 2.959 fi 2.960 @@ -6359,7 +6376,7 @@ 2.961 if test -z "$ac_t"; then 2.962 break 2.963 elif $ac_last_try; then 2.964 - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 2.965 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 2.966 else 2.967 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 2.968 fi 2.969 @@ -6444,7 +6461,7 @@ 2.970 _ACAWK 2.971 _ACEOF 2.972 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 2.973 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 2.974 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 2.975 fi # test -n "$CONFIG_HEADERS" 2.976 2.977 2.978 @@ -6457,7 +6474,7 @@ 2.979 esac 2.980 case $ac_mode$ac_tag in 2.981 :[FHL]*:*);; 2.982 - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 2.983 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 2.984 :[FH]-) ac_tag=-:-;; 2.985 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 2.986 esac 2.987 @@ -6485,7 +6502,7 @@ 2.988 [\\/$]*) false;; 2.989 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 2.990 esac || 2.991 - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 2.992 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 2.993 esac 2.994 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 2.995 as_fn_append ac_file_inputs " '$ac_f'" 2.996 @@ -6512,7 +6529,7 @@ 2.997 2.998 case $ac_tag in 2.999 *:-:* | *:-) cat >"$tmp/stdin" \ 2.1000 - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 2.1001 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 2.1002 esac 2.1003 ;; 2.1004 esac 2.1005 @@ -6649,22 +6666,22 @@ 2.1006 $ac_datarootdir_hack 2.1007 " 2.1008 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 2.1009 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1010 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1011 2.1012 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 2.1013 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 2.1014 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 2.1015 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.1016 -which seems to be undefined. Please make sure it is defined." >&5 2.1017 +which seems to be undefined. Please make sure it is defined" >&5 2.1018 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.1019 -which seems to be undefined. Please make sure it is defined." >&2;} 2.1020 +which seems to be undefined. Please make sure it is defined" >&2;} 2.1021 2.1022 rm -f "$tmp/stdin" 2.1023 case $ac_file in 2.1024 -) cat "$tmp/out" && rm -f "$tmp/out";; 2.1025 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 2.1026 esac \ 2.1027 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1028 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1029 ;; 2.1030 :H) 2.1031 # 2.1032 @@ -6675,19 +6692,19 @@ 2.1033 $as_echo "/* $configure_input */" \ 2.1034 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 2.1035 } >"$tmp/config.h" \ 2.1036 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1037 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1038 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 2.1039 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 2.1040 $as_echo "$as_me: $ac_file is unchanged" >&6;} 2.1041 else 2.1042 rm -f "$ac_file" 2.1043 mv "$tmp/config.h" "$ac_file" \ 2.1044 - || as_fn_error "could not create $ac_file" "$LINENO" 5 2.1045 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.1046 fi 2.1047 else 2.1048 $as_echo "/* $configure_input */" \ 2.1049 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 2.1050 - || as_fn_error "could not create -" "$LINENO" 5 2.1051 + || as_fn_error $? "could not create -" "$LINENO" 5 2.1052 fi 2.1053 # Compute "$ac_file"'s index in $config_headers. 2.1054 _am_arg="$ac_file" 2.1055 @@ -6837,7 +6854,7 @@ 2.1056 ac_clean_files=$ac_clean_files_save 2.1057 2.1058 test $ac_write_fail = 0 || 2.1059 - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 2.1060 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 2.1061 2.1062 2.1063 # configure is writing to config.log, and then calls config.status. 2.1064 @@ -6858,7 +6875,7 @@ 2.1065 exec 5>>config.log 2.1066 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 2.1067 # would make configure fail if this is the last instruction. 2.1068 - $ac_cs_success || as_fn_exit $? 2.1069 + $ac_cs_success || as_fn_exit 1 2.1070 fi 2.1071 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 2.1072 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5